diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-12 13:07:00 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-12 13:07:00 +0100 |
| commit | cf32efbedfae65a9a29a1581096041193a372ed3 (patch) | |
| tree | 6cfd88c252c72fa0516451e726caa2ed5dd1a84b /src/dialogs | |
| parent | 9b340999c4cb9db1975c4b63f3388899d9023944 (diff) | |
| parent | 9dc39b7f0610990dabf9f8544ca64ff5175e7c77 (diff) | |
| download | qtquickcontrols-cf32efbedfae65a9a29a1581096041193a372ed3.tar.gz | |
Merge remote-tracking branch 'origin/5.10' into 5.11
Change-Id: I2d12dd7b271e17662295007f5cf25ff4b3b78e8e
Diffstat (limited to 'src/dialogs')
| -rw-r--r-- | src/dialogs/doc/src/qtquickdialogs-index.qdoc | 10 |
1 files changed, 9 insertions, 1 deletions
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 - */ |