diff options
| author | Nico Vertriest <nico.vertriest@theqtcompany.com> | 2015-11-30 13:07:14 +0100 |
|---|---|---|
| committer | Nico Vertriest <nico.vertriest@theqtcompany.com> | 2015-12-03 13:26:05 +0000 |
| commit | 5bc6797276a7f04c6485245f9c045d2cd2fd7547 (patch) | |
| tree | f26f81ece55dc16b71e7dfe891b9fbff5ca36d84 | |
| parent | a5a1a2ec87cac6e92cfd337a8ceadc23d96ce0b5 (diff) | |
| download | qtdoc-5bc6797276a7f04c6485245f9c045d2cd2fd7547.tar.gz | |
Doc: added SSL version info to dependencies documentation
Change-Id: I8853390966d976c35aeafb84db3ca0ed47e2c022
Task-number: QTBUG-43813
Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| -rw-r--r-- | doc/src/platforms/linux.qdoc | 4 | ||||
| -rw-r--r-- | doc/src/platforms/windows.qdoc | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/doc/src/platforms/linux.qdoc b/doc/src/platforms/linux.qdoc index ecd8ef40..0a2204e6 100644 --- a/doc/src/platforms/linux.qdoc +++ b/doc/src/platforms/linux.qdoc @@ -724,6 +724,10 @@ above. Do this by adding them to the \c LIBS variable in your project file. + 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. + \section2 Qt Plugins All Qt GUI applications require a plugin that implements the \l {Qt diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc index 1599aff8..d814765c 100644 --- a/doc/src/platforms/windows.qdoc +++ b/doc/src/platforms/windows.qdoc @@ -932,6 +932,10 @@ When looking at the plugin DLLs the exact same dependencies are listed. + 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. + \section2 Qt Plugins All Qt GUI applications require a plugin that implements the \l {Qt |