summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNicholas Bennett <[email protected]>2022-08-15 11:10:54 +0300
committerNicholas Bennett <[email protected]>2022-08-30 13:46:01 +0000
commitb25b8ba1a92acc92b981d10cccd40bb0c9ba6add (patch)
treefd3304e66e245d9d19cec72132b8604d6a8144be /src
parentda12a40b8b2c2d212412a9db6d7971dc43bce6e6 (diff)
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 <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/network/doc/src/ssl.qdoc5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/network/doc/src/ssl.qdoc b/src/network/doc/src/ssl.qdoc
index 84247aee1be..e0166effa7a 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