summaryrefslogtreecommitdiffstats
path: root/src/concurrent/doc/src/qtconcurrent-index.qdoc
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2018-01-22 16:04:46 +0100
committerKai Koehne <kai.koehne@qt.io>2018-01-24 13:19:24 +0000
commitc4b596fb7902abfb9d53e7819612b9a83ac5a8d6 (patch)
tree2e9aa6af71b41f5c36d42971f3a1af908c2ab4ec /src/concurrent/doc/src/qtconcurrent-index.qdoc
parentaaacae8fe7bb1ca4983cf95fcb8d38320bb21450 (diff)
Document licenses for all Qt modules
Follow the example of the other modules and explicitly mention the valid licenses on each module landing page, optionally combining it with trademark information. Change-Id: I9f1fea0f002e0ab607da89a0cbfe7c53060582d7 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
Diffstat (limited to 'src/concurrent/doc/src/qtconcurrent-index.qdoc')
-rw-r--r--src/concurrent/doc/src/qtconcurrent-index.qdoc11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/concurrent/doc/src/qtconcurrent-index.qdoc b/src/concurrent/doc/src/qtconcurrent-index.qdoc
index 836cde131c..3e4aa791f1 100644
--- a/src/concurrent/doc/src/qtconcurrent-index.qdoc
+++ b/src/concurrent/doc/src/qtconcurrent-index.qdoc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
@@ -133,4 +133,13 @@
copy of the container when called. If you are using STL containers this copy operation
might take some time, in this case we recommend specifying the begin and end iterators
for the container instead.
+
+ \section1 Licenses
+
+ The Qt Concurrent 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.
*/