summaryrefslogtreecommitdiffstats
path: root/src/xml
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/xml
parent6dbf3576093858d981d8321b00f0b19faa7cf217 (diff)
parent342bb5b03a76d1428fafb8e1532d66e172bd1c0b (diff)
Merge remote-tracking branch 'origin/5.9' into 5.10
Diffstat (limited to 'src/xml')
-rw-r--r--src/xml/doc/src/qtxml-index.qdoc11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/xml/doc/src/qtxml-index.qdoc b/src/xml/doc/src/qtxml-index.qdoc
index eb35903756..91f2515d60 100644
--- a/src/xml/doc/src/qtxml-index.qdoc
+++ b/src/xml/doc/src/qtxml-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.
@@ -45,4 +45,13 @@
The \l{Qt XML C++ Classes} page gives an overview over the available classes
in this module.
+
+ \section1 Licenses
+
+ The Qt XML 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.
*/