diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-06-11 10:30:48 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-06-11 10:30:48 +0200 |
| commit | 3c662bf13cdc509c1f40c59ad30711c909006b06 (patch) | |
| tree | 8d20ff8e1aaf0f15c768e1f289bcabeed449a4cb /src/network/doc | |
| parent | 17790dd030cf05951c6bc886362e5645bb4eb686 (diff) | |
| parent | 2ea3e133c369deefeae0605ad2f32aaea52c9e97 (diff) | |
Merge remote-tracking branch 'origin/5.13.0' into 5.13
Conflicts:
src/plugins/platforms/wasm/qwasmintegration.cpp
src/plugins/platforms/wasm/qwasmintegration.h
Change-Id: Idf4c7936513fb1f21daa8f6105b8545f13447bb8
Diffstat (limited to 'src/network/doc')
| -rw-r--r-- | src/network/doc/src/ssl.qdoc | 15 |
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. */ |