summaryrefslogtreecommitdiffstats
path: root/src/concurrent
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-01-26 10:09:05 +0100
committerLiang Qi <liang.qi@qt.io>2018-01-26 10:09:06 +0100
commit9f065554ffea0e3716b76e4bee4a60f0044193ce (patch)
tree735c2257cc9b50b847646aa1e0e5abb603b6482d /src/concurrent
parent6dbf3576093858d981d8321b00f0b19faa7cf217 (diff)
parent342bb5b03a76d1428fafb8e1532d66e172bd1c0b (diff)
Merge remote-tracking branch 'origin/5.9' into 5.10
Diffstat (limited to 'src/concurrent')
-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.
*/