diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-27 18:41:24 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-27 18:41:24 +0100 |
| commit | f74c888ae8d0c04d9b1d944fe61dc9a7e86b5420 (patch) | |
| tree | 3bd16bce5d4ae8bc4bf185742cf21af890b7bbdf /src/dialogs | |
| parent | a01f770f1d64770f8a81a53b812d1e086916fff2 (diff) | |
| parent | 949884153ae14724c30f17c75656aa0c6f072559 (diff) | |
| download | qtquickcontrols-f74c888ae8d0c04d9b1d944fe61dc9a7e86b5420.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I4b1a4ebf258c9d31e537f42c8d0219c4294628bb
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 - */ |