diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-24 13:23:45 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-24 13:23:45 +0100 |
| commit | b78db8c1e4ec16ef8dff1585d14f9375551c47df (patch) | |
| tree | f62668cea56b9a314224ab5167bc68d725960099 /src/qml/doc | |
| parent | 2570b801c74832a3c83a8b56ad0f76812969e190 (diff) | |
| parent | b64a1b3078a764797cbc3e1e4a456257c32721d6 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I37bc7afea415261639b71e7b8dfc9177fdd4cb62
Diffstat (limited to 'src/qml/doc')
| -rw-r--r-- | src/qml/doc/src/qtqml.qdoc | 5 |
1 files changed, 3 insertions, 2 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} |