From b25b8ba1a92acc92b981d10cccd40bb0c9ba6add Mon Sep 17 00:00:00 2001 From: Nicholas Bennett Date: Mon, 15 Aug 2022 11:10:54 +0300 Subject: [PATCH] Docs: Improve documentation regarding adding SSL support Added link to Adding Open SSL support to Android Applications Users are having difficulty finding this information, so adding a link to the networking module's SSL Classes page. Clarified the section title for adding SSL when building Qt from source. Pick-to: 6.3 6.4 Change-Id: I88fbf696583d75c76d3b9778dbacd058eb00b50d Reviewed-by: Paul Wicking --- src/network/doc/src/ssl.qdoc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/network/doc/src/ssl.qdoc b/src/network/doc/src/ssl.qdoc index 84247aee1b..e0166effa7 100644 --- a/src/network/doc/src/ssl.qdoc +++ b/src/network/doc/src/ssl.qdoc @@ -13,13 +13,14 @@ the \l{OpenSSL Toolkit}, or any appropriate TLS plugin to perform encryption and protocol handling. - From Qt version 5.15 onwards, the officially supported version for OpenSSL + From Qt version 5.15 onward, the officially supported version for OpenSSL is 1.1.1 or later. \annotatedlist ssl + For Android applications see \l{Adding OpeSSL Support for Android}. - \section1 Enabling and Disabling SSL Support + \section1 Enabling and Disabling SSL Support when Building Qt from Source When building Qt from source, Qt builds plugins for native TLS libraries that are supported for the operating system you are building for. For