summaryrefslogtreecommitdiffstats
path: root/src/network/doc
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2019-06-03 16:12:47 +0200
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2019-06-04 07:48:34 +0000
commit29425f1e7776c3fcea3b041484d97683a57b431d (patch)
tree200ae8b0df7c566fb1e637f6679dcaec8c9a1a90 /src/network/doc
parentca0f85da82252057894401ada4c2daac63d770bb (diff)
Update documentation regarding import/export restrictions for OpenSSL
From Qt 5.12.5 and 5.13.0 on we ship OpenSSL 1.1.x libraries with Qt through the binary installers, as Qt is a general purpose toolkit and as such not subject to import/export restrictions. However, application developers still have to take care of the relevant requirements and compliance before distributing OpenSSL. Change-Id: I1c3622116eadda270d638becfa23a5493976e919 Fixes: QTBUG-75814 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
Diffstat (limited to 'src/network/doc')
-rw-r--r--src/network/doc/src/ssl.qdoc15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/network/doc/src/ssl.qdoc b/src/network/doc/src/ssl.qdoc
index a3af1d0477..e485a1b393 100644
--- a/src/network/doc/src/ssl.qdoc
+++ b/src/network/doc/src/ssl.qdoc
@@ -77,11 +77,12 @@
\section1 Import and Export Restrictions
- Due to import and export restrictions in some parts of the world, we
- are unable to supply the OpenSSL Toolkit with Qt packages. Developers wishing
- to use SSL communication in their deployed applications should either ensure
- that their users have the appropriate libraries installed, or they should
- consult a suitably qualified legal professional to ensure that applications
- using code from the OpenSSL project are correctly certified for import
- and export in relevant regions of the world.
+ Qt binary installers include the OpenSSL libraries used by QtNetwork. However,
+ those are not automatically deployed with applications that are built with Qt.
+ Import and export restrictions apply for some types of software, and for
+ some parts of the world. Developers wishing to use SSL communication in their
+ deployed applications should either ensure that their users have the appropriate
+ libraries installed, or they should consult a suitably qualified legal
+ professional to ensure that applications using code from the OpenSSL project
+ are correctly certified for import and export in relevant regions of the world.
*/