diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-16 08:54:58 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-16 08:54:58 +0100 |
| commit | 942ab490724fcc9544e786e5783718e1a07aa50b (patch) | |
| tree | feb7d3ff716edb37b2ca60e33c05adf8777bd964 /src/testlib/doc | |
| parent | 0fb8271a467202990c90321066e40faed640a7a8 (diff) | |
| parent | 24adaa9a742e6f95ff897d0eb9a2bce0527dd042 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/corelib/tools/tools.pri
Change-Id: I705630f9cecbf0ce51a22fc6116b8c49611259e9
Diffstat (limited to 'src/testlib/doc')
| -rw-r--r-- | src/testlib/doc/src/qttest-index.qdoc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/testlib/doc/src/qttest-index.qdoc b/src/testlib/doc/src/qttest-index.qdoc index 7b3e96f72e..b3c2be7375 100644 --- a/src/testlib/doc/src/qttest-index.qdoc +++ b/src/testlib/doc/src/qttest-index.qdoc @@ -55,12 +55,13 @@ \section1 Licenses and Attributions Qt Test 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 Test potentially contains third party + Furthermore, Qt Test in Qt \QtVersion may contain third party modules under following permissive licenses: \generatelist{groupsbymodule attributions-qttestlib} |