diff options
Diffstat (limited to 'src/network/doc/src')
-rw-r--r-- | src/network/doc/src/examples.qdoc | 8 | ||||
-rw-r--r-- | src/network/doc/src/ssl.qdoc | 7 |
2 files changed, 6 insertions, 9 deletions
diff --git a/src/network/doc/src/examples.qdoc b/src/network/doc/src/examples.qdoc index 1eb397d011..ee9084c74c 100644 --- a/src/network/doc/src/examples.qdoc +++ b/src/network/doc/src/examples.qdoc @@ -7,7 +7,7 @@ \title Network Examples \brief How to do network programming in Qt. - \image network-examples.png + \image network-examples.webp Qt is provided with an extensive set of network classes to support both client-based and server side network programming. @@ -22,18 +22,12 @@ \li \l{network/blockingfortuneclient}{Blocking Fortune Client}\raisedaster \li \l{network/broadcastreceiver}{Broadcast Receiver} \li \l{network/broadcastsender}{Broadcast Sender} - \li \l{network/download}{Download} - \li \l{network/downloadmanager}{Download Manager} \li \l{network/network-chat}{Network Chat} \li \l{network/fortuneclient}{Fortune Client}\raisedaster \li \l{network/fortuneserver}{Fortune Server}\raisedaster \li \l{network/http}{HTTP} - \li \l{network/loopback}{Loopback} \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..83549f61e8 100644 --- a/src/network/doc/src/ssl.qdoc +++ b/src/network/doc/src/ssl.qdoc @@ -13,13 +13,16 @@ 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. + Qt version 5.15.1 onward is also compatible with OpenSSL 3. + \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 |