diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-21 01:00:08 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-21 01:00:09 +0200 |
| commit | 7a252ac46780b6145084d8d5ca0549b2de3639cc (patch) | |
| tree | e8a938a26fb610e0eaba62dcf185b2e361f01951 /src/network/doc/src/ssl.qdoc | |
| parent | 10b8ed816d0dff4321d5a8b0723a8090b2058678 (diff) | |
| parent | 2708c6c11d685ab25c12d558961d924c9a4533d2 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: Iaf28977e7ecf566b28b9406dcb005d48621169c2
Diffstat (limited to 'src/network/doc/src/ssl.qdoc')
| -rw-r--r-- | src/network/doc/src/ssl.qdoc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/network/doc/src/ssl.qdoc b/src/network/doc/src/ssl.qdoc index 840cec9e5b..a3af1d0477 100644 --- a/src/network/doc/src/ssl.qdoc +++ b/src/network/doc/src/ssl.qdoc @@ -36,9 +36,8 @@ the Secure Sockets Layer (SSL) protocol, using the \l{OpenSSL Toolkit} to perform encryption and protocol handling. - From Qt version 5.2 onwards, 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 work. + From Qt version 5.6 onwards, the officially supported version for OpenSSL + is 1.0.0 or later. \annotatedlist ssl |