summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNico Vertriest <nico.vertriest@theqtcompany.com>2016-08-22 14:15:11 +0200
committerTopi Reiniƶ <topi.reinio@theqtcompany.com>2016-09-23 10:48:50 +0000
commitbde3384c9e3423b2b5fec565a32e49a1f796cd68 (patch)
tree4ea55adfa3a2b966efc030f04f3edb8ad4189193 /src
parent9f45d2ab03a643348c6f0c464aa48755b301498d (diff)
Doc: corrected reference to OpenSSL webpage
Change-Id: I0314aac1e37615605a30d9dcc4962b9e7f883517 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/network/doc/src/ssl.qdoc6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/network/doc/src/ssl.qdoc b/src/network/doc/src/ssl.qdoc
index 0129673ea2..5ad2cfafc6 100644
--- a/src/network/doc/src/ssl.qdoc
+++ b/src/network/doc/src/ssl.qdoc
@@ -36,10 +36,12 @@
the Secure Sockets Layer (SSL) protocol, using the OpenSSL Toolkit (\l{http://www.openssl.org/})
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.
+
\annotatedlist ssl
- See the \l {openssl-v1later}{OpenSSL Compatibility} page for information about the
- versions of OpenSSL that are known to work with Qt.
\section1 Enabling and Disabling SSL Support