diff options
author | Liang Qi <liang.qi@qt.io> | 2016-09-26 21:43:25 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-09-26 21:43:25 +0200 |
commit | 06bd93c4acf49fc24408a60ebdf7a46caf02f9b3 (patch) | |
tree | eedbdaa40fbf20bb99187084dd9edf14f73f05bd /src/testlib/doc/src/qttest-index.qdoc | |
parent | bafad505a0adb21b819f7617e5e802bf2d52fd54 (diff) | |
parent | 41a7d74385eece725435159ca021151e871bf116 (diff) |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/plugins/platforms/ios/qiosmessagedialog.mm
Change-Id: Icfbf55c3215ec088e552d0b42a5c94d04b17c65f
Diffstat (limited to 'src/testlib/doc/src/qttest-index.qdoc')
-rw-r--r-- | src/testlib/doc/src/qttest-index.qdoc | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/testlib/doc/src/qttest-index.qdoc b/src/testlib/doc/src/qttest-index.qdoc index b16ab7944a..36ebfee463 100644 --- a/src/testlib/doc/src/qttest-index.qdoc +++ b/src/testlib/doc/src/qttest-index.qdoc @@ -50,6 +50,19 @@ \li \l{Qt Test Tutorial} \endlist + \section1 Licenses and Attributions + + Qt Test is available under commercial licenses from \l{The Qt Company}. + In addition, it is available under the + \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 + modules under following permissive licenses: + + \generatelist{groupsbymodule attributions-qttestlib} + \section1 Reference These are links to the API reference materials. |