diff options
author | Yoann Lopes <yoann.lopes@qt.io> | 2016-09-23 08:44:50 +0300 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@qt.io> | 2016-09-23 08:47:15 +0300 |
commit | 0d3434fd0491d8d37dc0286b9d8ec8a454ba726b (patch) | |
tree | 329557ed14a161827817765b0ccc6298fcf146b4 /src/multimedia/doc | |
parent | 01c9322bfe918b886468eb520d77b21b6d8c0c11 (diff) | |
parent | 62eeaba645d0f7c42246a0b026c532919a5b0454 (diff) | |
download | qtmultimedia-0d3434fd0491d8d37dc0286b9d8ec8a454ba726b.tar.gz |
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I96aca24df935d51b40380c727b6c5002432a6be6
Diffstat (limited to 'src/multimedia/doc')
-rw-r--r-- | src/multimedia/doc/src/multimedia.qdoc | 2 | ||||
-rw-r--r-- | src/multimedia/doc/src/qtmultimedia-index.qdoc | 2 | ||||
-rw-r--r-- | src/multimedia/doc/src/qtmultimedia5.qdoc | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/multimedia/doc/src/multimedia.qdoc b/src/multimedia/doc/src/multimedia.qdoc index 813847d88..84df488d2 100644 --- a/src/multimedia/doc/src/multimedia.qdoc +++ b/src/multimedia/doc/src/multimedia.qdoc @@ -177,7 +177,7 @@ what changed, and what you might need to change when porting code. \section2 QML Types The QML types are accessed by using: \code -import QtMultimedia 5.6 +import QtMultimedia 5.7 \endcode \annotatedlist multimedia_qml The following types are accessed by using \l{Qt Audio Engine QML Types}{Qt Audio Engine}: diff --git a/src/multimedia/doc/src/qtmultimedia-index.qdoc b/src/multimedia/doc/src/qtmultimedia-index.qdoc index 989b8886e..a474a355e 100644 --- a/src/multimedia/doc/src/qtmultimedia-index.qdoc +++ b/src/multimedia/doc/src/qtmultimedia-index.qdoc @@ -54,7 +54,7 @@ import statement in your \c {.qml} file. \code - import QtMultimedia 5.6 + import QtMultimedia 5.7 \endcode If you intend to use the C++ classes in your application, include the C++ diff --git a/src/multimedia/doc/src/qtmultimedia5.qdoc b/src/multimedia/doc/src/qtmultimedia5.qdoc index 21854ae7c..bc200819b 100644 --- a/src/multimedia/doc/src/qtmultimedia5.qdoc +++ b/src/multimedia/doc/src/qtmultimedia5.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! -\qmlmodule QtMultimedia 5.6 +\qmlmodule QtMultimedia 5.7 \title Qt Multimedia QML Types \ingroup qmlmodules \brief Provides QML types for multimedia support. @@ -42,7 +42,7 @@ The QML types for \l{Qt Multimedia} support the basic use cases such as: The QML types can be imported into your application using the following import statement in your .qml file: \code -import QtMultimedia 5.6 +import QtMultimedia 5.7 \endcode \section1 QML types |