diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-18 18:01:58 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-18 18:01:58 +0100 |
| commit | 2e9d1fa5ef1367e5d2ace88bc47f93b8fe8a039b (patch) | |
| tree | e34abd8ef99ae1abb2730a3772debe3fc9b26144 /src/multimedia/doc/src/qtmultimedia-index.qdoc | |
| parent | b8609cd3ffeddd02a514c6b5f9170c8017966e41 (diff) | |
| parent | 7638848d2486e2fac9764b60a99de08f50adc8eb (diff) | |
| download | qtmultimedia-2e9d1fa5ef1367e5d2ace88bc47f93b8fe8a039b.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I7566f543ce11ff6cddc4d17e2c258a582f365b65
Diffstat (limited to 'src/multimedia/doc/src/qtmultimedia-index.qdoc')
| -rw-r--r-- | src/multimedia/doc/src/qtmultimedia-index.qdoc | 9 |
1 files changed, 9 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 |