diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2022-09-27 09:39:07 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-10-04 08:01:44 +0000 |
| commit | 9e85ce8a97e6a3e67671fc734385d402e6cf9d7e (patch) | |
| tree | fca9b126a478a527b3df25d898e529f437835c45 | |
| parent | 96c5bd674a2b9d61eaa129141ada9870fb598c52 (diff) | |
| download | qtdoc-9e85ce8a97e6a3e67671fc734385d402e6cf9d7e.tar.gz | |
Doc: Consolidate information about SSL
Since Qt 5.15, we only support OpenSSL 1.1.1 or later.
Change-Id: Ifc0066767a2bec40dcce7b68bcbdfee2944eb7d9
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit aead590843909462686204feb68c76744a3b7e47)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | doc/src/configure.qdoc | 1 | ||||
| -rw-r--r-- | doc/src/connectivity.qdoc | 3 | ||||
| -rw-r--r-- | doc/src/platforms/linux.qdoc | 4 | ||||
| -rw-r--r-- | doc/src/platforms/windows.qdoc | 8 |
4 files changed, 5 insertions, 11 deletions
diff --git a/doc/src/configure.qdoc b/doc/src/configure.qdoc index 71a19bf2..c50fb442 100644 --- a/doc/src/configure.qdoc +++ b/doc/src/configure.qdoc @@ -246,6 +246,7 @@ The most feature-complete support that also works on almost all target platforms is provided by the \l {OpenSSL Toolkit} (option \b{-openssl}). + Qt does require OpenSSL 1.1.1 or later. Qt can be configured to use OpenSSL in three ways: \list diff --git a/doc/src/connectivity.qdoc b/doc/src/connectivity.qdoc index f9623ded..d447b6a3 100644 --- a/doc/src/connectivity.qdoc +++ b/doc/src/connectivity.qdoc @@ -48,8 +48,7 @@ that there is no HTTP server class in Qt. For secure communication via SSL, Qt Network offers a wide range of classes alongside the central QSslSocket, e.g. QSslCertificate, QSslConfiguration and -QSslError. The only supported backend for SSL in Qt is OpenSSL, which needs to -be installed separately. +QSslError. Qt also offers HTTP support in QML by either using HTTP explicitly via XmlHttpRequest, or by transparently using HTTP URLs in e.g. Image sources. diff --git a/doc/src/platforms/linux.qdoc b/doc/src/platforms/linux.qdoc index d7aecbf2..f3274b81 100644 --- a/doc/src/platforms/linux.qdoc +++ b/doc/src/platforms/linux.qdoc @@ -706,10 +706,6 @@ above. Do this by adding them to the \c LIBS variable in your project file. - From Qt version 5.2 onward, the officially supported version for - OpenSSL is 1.0.0 or later. Versions >= 0.9.7 and < 1.0.0 might work, - but are not guaranteed to. - \section2 Qt Plugins All Qt GUI applications require a plugin that implements the \l {Qt diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc index c4a42188..d4251c6c 100644 --- a/doc/src/platforms/windows.qdoc +++ b/doc/src/platforms/windows.qdoc @@ -548,7 +548,9 @@ required software-based OpenGL, if the application is compatible with it. If Qt was configured to link against ICU or OpenSSL, the respective DLL's - need to be added to the \c release folder, too. + need to be added to the \c release folder, too. But the binary + packages for Qt on Windows do require this. For more details, see also + \l{Third-Party Libraries}. \omit \note \l{Qt WebEngine} applications have additional requirements that are @@ -773,10 +775,6 @@ When looking at the plugin DLLs the exact same dependencies are listed. - From Qt version 5.2 onward, the officially supported version - for OpenSSL is 1.0.0 or later. Versions >= 0.9.7 and < 1.0.0 might - work, but are not guaranteed to. - \section2 Qt Plugins All Qt GUI applications require a plugin that implements the \l {Qt |