diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-28 11:07:32 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-28 11:10:29 +0100 |
commit | 02ba93dd3dc640421c79c655064f0b2c4f1465cd (patch) | |
tree | 156ccba392968d3d2ba3bcb5bb098a1ff0b7e8ce /src/network/doc | |
parent | bf5f2a9e3e3bf70c373b65bf95a332f4e1c514f9 (diff) | |
parent | 0b68fc019bbeedb8b6b59bbbdf31f66596b6d5ac (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I12b4d8b99bdccae53b1a978cd6eb8f4ac6fb3c76
Diffstat (limited to 'src/network/doc')
-rw-r--r-- | src/network/doc/src/ssl.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/doc/src/ssl.qdoc b/src/network/doc/src/ssl.qdoc index 4fea6f00a9..7c6ba1155f 100644 --- a/src/network/doc/src/ssl.qdoc +++ b/src/network/doc/src/ssl.qdoc @@ -73,6 +73,6 @@ using code from the OpenSSL project are correctly certified for import and export in relevant regions of the world. - When the QtNetwork module is built with SSL support, the library is linked + When the Qt Network module is built with SSL support, the library is linked against OpenSSL in a way that requires OpenSSL license compliance. */ |