diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-23 03:00:03 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-23 03:00:03 +0200 |
| commit | 90e38c501aedc103dd4d8c1de1526efc6818de98 (patch) | |
| tree | 34bca7bb5d48b5389a0e5a57797d51e843a72c0b /src | |
| parent | 43e8d6d6b6a71f34fa8a7ef4683665446ac3047f (diff) | |
| parent | 9acfa7d281efceec38ef8e8bdd03376993fd2594 (diff) | |
| download | qtscript-90e38c501aedc103dd4d8c1de1526efc6818de98.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ieea89c3b8d092df29750074df133480e1b5d95d4
Diffstat (limited to 'src')
| -rw-r--r-- | src/script/doc/src/qtscript-index.qdoc | 14 | ||||
| -rw-r--r-- | src/scripttools/doc/src/qtscripttools-index.qdoc | 9 |
2 files changed, 23 insertions, 0 deletions
diff --git a/src/script/doc/src/qtscript-index.qdoc b/src/script/doc/src/qtscript-index.qdoc index 064888b..6cf347f 100644 --- a/src/script/doc/src/qtscript-index.qdoc +++ b/src/script/doc/src/qtscript-index.qdoc @@ -35,6 +35,20 @@ \tableofcontents + \section1 Licenses and Attributions + + Qt Script is available under commercial licenses from \l{The Qt Company}. + 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 Script in Qt \QtVersion does contain third-party + modules under following permissive licenses: + + \generatelist{groupsbymodule attributions-qtscript} + \section1 Scripting Classes The following classes add scripting capabilities to Qt applications. diff --git a/src/scripttools/doc/src/qtscripttools-index.qdoc b/src/scripttools/doc/src/qtscripttools-index.qdoc index 339c8b8..84f09c5 100644 --- a/src/scripttools/doc/src/qtscripttools-index.qdoc +++ b/src/scripttools/doc/src/qtscripttools-index.qdoc @@ -46,6 +46,15 @@ \snippet doc_src_qtscripttools.pro 1 + \section1 Licenses + + Qt Script Tools is available under commercial licenses from \l{The Qt Company}. + 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. + \section1 Related Information \section2 Guides |