diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:41:41 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-20 23:11:02 +0100 |
| commit | d04483a5c13b6b5ac463f2a8d584839eab9aeede (patch) | |
| tree | 042c340ea1265a9f3931c6d92c0fef8c9cb5edc1 /src/multimedia/doc/src/qtmultimedia-index.qdoc | |
| parent | 950e9b472890478f0460a060ae08cc16a06ac659 (diff) | |
| parent | a3fb242676055355deb68788199ae59abe58ca41 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/plugins/avfoundation/mediaplayer/avfmediaplayersession.h
src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm
Change-Id: Ic43fb2a805ed9f0f2ea48993d47859716f1f11b4
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 |