diff options
Diffstat (limited to 'src/network/doc/src')
| -rw-r--r-- | src/network/doc/src/examples.qdoc | 2 | ||||
| -rw-r--r-- | src/network/doc/src/ssl.qdoc | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/network/doc/src/examples.qdoc b/src/network/doc/src/examples.qdoc index 1eb397d011..4a39ca4a1b 100644 --- a/src/network/doc/src/examples.qdoc +++ b/src/network/doc/src/examples.qdoc @@ -32,8 +32,6 @@ \li \l{network/threadedfortuneserver}{Threaded Fortune Server}\raisedaster \li \l{network/torrent}{Torrent} \li \l{network/googlesuggest}{Google Suggest} - \li \l{network/bearercloud}{Bearer Cloud}\raisedaster - \li \l{network/bearermonitor}{Bearer Monitor} \li \l{network/securesocketclient}{Secure Socket Client} \li \l{network/multicastreceiver}{Multicast Receiver} \li \l{network/multicastsender}{Multicast Sender} diff --git a/src/network/doc/src/ssl.qdoc b/src/network/doc/src/ssl.qdoc index 84247aee1b..ba13c97cfc 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 OpenSSL 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 |