summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2018-01-10 10:36:26 +0100
committerKai Koehne <kai.koehne@qt.io>2018-01-22 10:08:47 +0000
commit69f71318db48616d51c8f81715e794b483c1fbfa (patch)
treeafc9d162d920cabe405b85df118e32a96b53524d
parenteb048e486daa3644476fdec5b0bd016b1729fc01 (diff)
downloadqtquickcontrols-69f71318db48616d51c8f81715e794b483c1fbfa.tar.gz
Document licenses
Every module should state the licenses it is available under in it's landing page. Change-Id: Ib2d5f49e57f7f34bf06a558725dcb53152561f8d Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
-rw-r--r--src/controls/doc/src/qtquickcontrols-index.qdoc9
-rw-r--r--src/dialogs/doc/src/qtquickdialogs-index.qdoc10
-rw-r--r--src/extras/doc/src/qtquickextras-index.qdoc9
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