summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-05-22 03:00:39 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-05-22 03:00:39 +0200
commit7ecded9968550011fb4d4d2e2dd02dd29c1054b3 (patch)
tree8fe26f5f724fb05b56cdd3b0fc6f8ac8deffc8a1
parent89aa22b4a564f3fb2da1d49d27da4116d8eacb4e (diff)
parent88207ae868002f0b53151d2c5c2ac416284ce9c1 (diff)
Merge remote-tracking branch 'origin/5.11' into dev
-rw-r--r--src/nfc/doc/src/nfc-index.qdoc9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/nfc/doc/src/nfc-index.qdoc b/src/nfc/doc/src/nfc-index.qdoc
index c9acc92b..21f775a6 100644
--- a/src/nfc/doc/src/nfc-index.qdoc
+++ b/src/nfc/doc/src/nfc-index.qdoc
@@ -60,6 +60,15 @@ import statement in your \c .qml file:
\snippet doc_src_qtnfc.qml import
+\section1 Licenses
+
+Qt NFC 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 Guides