summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-05-19 03:00:41 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-05-19 03:00:41 +0200
commitfed0e6a81a3cd1f331270a90450c44e570c3e18c (patch)
treeae3c179e6cc39721588550da752cb5a808dfd077
parent51acbccd39c5e253d6be02a7360a218f26b69758 (diff)
parent335d9f2513bea8dc6ef8e7d3c07f0d288dd7f658 (diff)
downloadqtx11extras-fed0e6a81a3cd1f331270a90450c44e570c3e18c.tar.gz
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Iee808a11759e452c298a74754ae3a60bc02f7c41
-rw-r--r--src/x11extras/doc/src/qtx11extras-index.qdoc9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/x11extras/doc/src/qtx11extras-index.qdoc b/src/x11extras/doc/src/qtx11extras-index.qdoc
index e89d606..1b2fcaf 100644
--- a/src/x11extras/doc/src/qtx11extras-index.qdoc
+++ b/src/x11extras/doc/src/qtx11extras-index.qdoc
@@ -52,6 +52,15 @@
Requirements for using X11 with Qt: \l{Qt for X11 Requirements}
+ \section1 Licenses
+
+ Qt X11 Extras 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 API Reference
Links to the API reference materials: