diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-02 09:51:07 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-02 09:51:07 +0100 |
| commit | 48bfc02e82cb4b666fb832ef0ace59af8a0c7ef2 (patch) | |
| tree | a9f32828dac6139393353ddfd6176311f08e821c /src | |
| parent | 698a8268f786d74726eb07255df2d26ac2269079 (diff) | |
| parent | a843884697602891d21b9f9bc62603548dd6a6b8 (diff) | |
| download | qtquickcontrols-48bfc02e82cb4b666fb832ef0ace59af8a0c7ef2.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I556a8404b908c15eaa71b009319c7f27274b40f1
Diffstat (limited to 'src')
| -rw-r--r-- | src/controls/doc/src/qtquickcontrols-index.qdoc | 9 | ||||
| -rw-r--r-- | src/dialogs/doc/src/qtquickdialogs-index.qdoc | 10 | ||||
| -rw-r--r-- | src/extras/doc/src/qtquickextras-index.qdoc | 9 |
3 files changed, 27 insertions, 1 deletions
diff --git a/src/controls/doc/src/qtquickcontrols-index.qdoc b/src/controls/doc/src/qtquickcontrols-index.qdoc index 63753ae1..28bc3644 100644 --- a/src/controls/doc/src/qtquickcontrols-index.qdoc +++ b/src/controls/doc/src/qtquickcontrols-index.qdoc @@ -54,6 +54,15 @@ Types that can be used to build menus. \annotatedlist menus + \section1 Licenses and Attributions + + The Qt Quick Controls module 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 \list diff --git a/src/dialogs/doc/src/qtquickdialogs-index.qdoc b/src/dialogs/doc/src/qtquickdialogs-index.qdoc index 7404dac9..f7fb245c 100644 --- a/src/dialogs/doc/src/qtquickdialogs-index.qdoc +++ b/src/dialogs/doc/src/qtquickdialogs-index.qdoc @@ -37,6 +37,15 @@ \annotatedlist qtquickdialogs + \section1 Licenses and Attributions + + The Qt Quick Dialogs module 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 Examples @@ -48,6 +57,5 @@ \list \li \l{Qt Quick Dialogs QML Types}{QML Types} \endlist - */ diff --git a/src/extras/doc/src/qtquickextras-index.qdoc b/src/extras/doc/src/qtquickextras-index.qdoc index 43d78590..4bc2e1da 100644 --- a/src/extras/doc/src/qtquickextras-index.qdoc +++ b/src/extras/doc/src/qtquickextras-index.qdoc @@ -44,6 +44,15 @@ the user. \annotatedlist extras + \section1 Licenses and Attributions + + The Qt Quick Extras module 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 \list |