diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2018-01-12 15:59:22 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2018-01-18 15:37:39 +0000 |
| commit | 7638848d2486e2fac9764b60a99de08f50adc8eb (patch) | |
| tree | c95b2aa5502b0ece38b6accb188740281c0b6d39 | |
| parent | d9587b44117ed3cc65bdc98615a42366c0f00b5c (diff) | |
Document licenses
Change-Id: I827a8de356f42217a64191a467fa850e3eb6f4ef
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| -rw-r--r-- | src/multimedia/doc/src/qtmultimedia-index.qdoc | 9 | ||||
| -rw-r--r-- | src/multimediawidgets/doc/src/qtmultimediawidgets-index.qdoc | 9 |
2 files changed, 18 insertions, 0 deletions
diff --git a/src/multimedia/doc/src/qtmultimedia-index.qdoc b/src/multimedia/doc/src/qtmultimedia-index.qdoc index 269e3d24a..5e4ba3c58 100644 --- a/src/multimedia/doc/src/qtmultimedia-index.qdoc +++ b/src/multimedia/doc/src/qtmultimedia-index.qdoc @@ -139,6 +139,15 @@ \li Base class for video presentation. \endtable + \section1 Licenses and Attributions + + The Qt Quick Multimedia 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. + \section1 Related Information \section2 Guides diff --git a/src/multimediawidgets/doc/src/qtmultimediawidgets-index.qdoc b/src/multimediawidgets/doc/src/qtmultimediawidgets-index.qdoc index 0c2271ef0..fc5bd6df6 100644 --- a/src/multimediawidgets/doc/src/qtmultimediawidgets-index.qdoc +++ b/src/multimediawidgets/doc/src/qtmultimediawidgets-index.qdoc @@ -48,6 +48,15 @@ file: QT += multimediawidgets \endcode +\section1 Licenses and Attributions + +The Qt Quick Multimedia Widgets 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. + \section1 Related Information \section2 Reference |