diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2018-01-12 16:12:27 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2018-01-22 12:20:43 +0000 |
| commit | c46a780e95605bc80bbe8129302d09cec06ba454 (patch) | |
| tree | c2c2dab45c640f75281ffe8ff7711e0cf2f751b4 /src | |
| parent | 69221e4f21abb3fdd8b3f609a4a6cfe33f9140ec (diff) | |
Doc: Do make 'Licenses and Attributions' valid for multiple Qt versions
The Qt documentation is supposed to be valid for older Qt versions too.
Anyhow, the generated attributions are only valid for the exact version
the documentation was generated from, so make this explicit.
Also mention since when the libraries are under LGPL3/GPL3.
Change-Id: Iec8f67e5e43be456cc77283ca6d2a7ebe142f501
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/doc/src/qtqml.qdoc | 5 | ||||
| -rw-r--r-- | src/quick/doc/src/qtquick.qdoc | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/qml/doc/src/qtqml.qdoc b/src/qml/doc/src/qtqml.qdoc index 833436a67c..a9f8e2a960 100644 --- a/src/qml/doc/src/qtqml.qdoc +++ b/src/qml/doc/src/qtqml.qdoc @@ -134,12 +134,13 @@ the QML code to interact with C++ code. \section1 Licenses and Attributions Qt QML is available under commercial licenses from \l{The Qt Company}. -In addition, it is available under the +In addition, it is available under free software licenses. Since Qt 5.4, +these free software licenses are \l{GNU Lesser General Public License, version 3}, or the \l{GNU General Public License, version 2}. See \l{Qt Licensing} for further details. -Furthermore Qt QML potentially contains third party +Furthermore Qt QML in Qt \QtVersion may contain third party modules under following permissive licenses: \generatelist{groupsbymodule attributions-qtqml} diff --git a/src/quick/doc/src/qtquick.qdoc b/src/quick/doc/src/qtquick.qdoc index e2d4f16dae..ece66cb589 100644 --- a/src/quick/doc/src/qtquick.qdoc +++ b/src/quick/doc/src/qtquick.qdoc @@ -89,7 +89,8 @@ To find out more about using the QML language, see the \l{Qt QML} module documen \section1 Licenses and Attributions Qt Quick is available under commercial licenses from \l{The Qt Company}. -In addition, it is available under the +In addition, it is available under free software licenses. Since Qt 5.4, +these free software licenses are \l{GNU Lesser General Public License, version 3}, or the \l{GNU General Public License, version 2}. See \l{Qt Licensing} for further details. |