diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2017-03-14 09:34:00 +0100 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2017-03-28 19:17:36 +0000 |
| commit | 484a663ee7d516d751f1fc349735b2c79efeb140 (patch) | |
| tree | 79350a96542848122622ad2c7bb39998f37b89b2 | |
| parent | 7853e8e51a65aa5c5d9e4c9bb66549e17a2ff022 (diff) | |
Remove clucene referencesv5.9.0-beta1
Change-Id: I2f2aa5b1aa3ccecaf6056486ff6c72fdd5649891
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| -rw-r--r-- | doc/src/deployment/deployment.qdoc | 23 | ||||
| -rw-r--r-- | doc/src/platforms/windows.qdoc | 2 |
2 files changed, 4 insertions, 21 deletions
diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc index 432bf831b..ebfda3f40 100644 --- a/doc/src/deployment/deployment.qdoc +++ b/doc/src/deployment/deployment.qdoc @@ -104,28 +104,11 @@ care must be taken when deploying applications that use these libraries, particularly when the application is statically linked to them. + For more information, see \l{Third-Party Licenses Used in Qt}. - The following table summarizes a few issues that - you should be aware of. - - \table - \header \li Qt Library \li Dependency - \li Licensing Issue - \row \li \l{QtHelp} \li CLucene - \li The version of clucene distributed with Qt is licensed - under the GNU LGPL version 2.1 or later. This has implications for - developers of closed source applications. Please see the - \l{Qt Help#License Information}{Qt Help} documentation for more information. - - \row \li \l{QtNetwork} \li OpenSSL - \li Some configurations of QtNetwork use OpenSSL at run-time. Deployment + Some configurations of QtNetwork use OpenSSL at run-time. Deployment of OpenSSL libraries is subject to both licensing and export restrictions. - More information can be found in the \l{Secure Sockets Layer (SSL) Classes} - documentation. - - \endtable - - For more information, see \l{Third-Party Licenses Used in Qt}. + For more information, see \l{Secure Sockets Layer (SSL) Classes}. \section1 Platform-Specific Notes diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc index 70cb7b8c0..71693ab7c 100644 --- a/doc/src/platforms/windows.qdoc +++ b/doc/src/platforms/windows.qdoc @@ -606,7 +606,7 @@ Qt libraries can be added by passing their name (-xml) or removed by passing the name prepended by --no- (--no-xml). Available libraries: - bluetooth clucene concurrent core declarative designer designercomponents + bluetooth concurrent core declarative designer designercomponents enginio gui qthelp multimedia multimediawidgets multimediaquick network nfc opengl positioning printsupport qml qmltooling quick quickparticles quickwidgets script scripttools sensors serialport sql svg test webkit webkitwidgets |