From 6069cc1cd1a6309cdffeb8bdd9c4035f33742228 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 21 Feb 2018 17:31:55 +0100 Subject: Doc: Add Licensing section to "Qt Quick Test", "Qt Quick Layouts" Mention licenses in the remaining landing pages. Change-Id: I3754d959db9d9e4914e50d670f159eba1afa7596 Reviewed-by: Simon Hausmann --- src/qmltest/doc/src/qtquicktest-index.qdoc | 9 +++++++++ src/quick/doc/src/concepts/layouts/qtquicklayouts-index.qdoc | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/src/qmltest/doc/src/qtquicktest-index.qdoc b/src/qmltest/doc/src/qtquicktest-index.qdoc index 6b5f8fdf4c..1f84db405c 100644 --- a/src/qmltest/doc/src/qtquicktest-index.qdoc +++ b/src/qmltest/doc/src/qtquicktest-index.qdoc @@ -182,4 +182,13 @@ #include "tst_mytest.moc" \endcode + + \section1 Licenses + + Qt Quick Tests 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. */ diff --git a/src/quick/doc/src/concepts/layouts/qtquicklayouts-index.qdoc b/src/quick/doc/src/concepts/layouts/qtquicklayouts-index.qdoc index f65b1152e9..a45ed4b45c 100644 --- a/src/quick/doc/src/concepts/layouts/qtquicklayouts-index.qdoc +++ b/src/quick/doc/src/concepts/layouts/qtquicklayouts-index.qdoc @@ -39,6 +39,15 @@ Visit the \l{Qt Quick Layouts Overview} page to get started. + \section1 Licenses + + Qt Quick Layouts 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 Layouts \annotatedlist layouts -- cgit v1.2.3