path: root/src/testlib
diff options
authorLiang Qi <>2018-02-16 08:07:08 +0000
committerThe Qt Project <>2018-02-16 22:31:50 +0000
commit048d8dee52545a9b0a548b4c56958a75a99d9aee (patch)
treec549685860a49e71809e06e90cc0fa6031a2def1 /src/testlib
parent6ffb358822db2e0d30fb34853c3222cd866d57c5 (diff)
parent942ab490724fcc9544e786e5783718e1a07aa50b (diff)
Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev
Diffstat (limited to 'src/testlib')
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}