diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-02 03:03:21 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-02 03:03:22 +0100 |
| commit | f1c5e109a48b6fdef641528985e249c10c1ae1a2 (patch) | |
| tree | dc4ec798c059e036980667cf7c41226e36ca49ce | |
| parent | 7ca4b60ab4e368f7800f5a9687c9fa58fc0bc574 (diff) | |
| parent | 09490d1ac6294173004f8f5b948dea9a1e412d3d (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ia2f6f90c44bb360810124bcfab558661a2644880
| -rw-r--r-- | src/multimedia/doc/src/qtmultimedia-index.qdoc | 6 | ||||
| -rw-r--r-- | src/multimedia/doc/src/qtmultimedia5.qdoc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/multimedia/doc/src/qtmultimedia-index.qdoc b/src/multimedia/doc/src/qtmultimedia-index.qdoc index 5e4ba3c58..c2734f4a9 100644 --- a/src/multimedia/doc/src/qtmultimedia-index.qdoc +++ b/src/multimedia/doc/src/qtmultimedia-index.qdoc @@ -53,9 +53,9 @@ The QML types can be imported into your applciation using the following import statement in your \c {.qml} file. - \code - import QtMultimedia 5.8 - \endcode + \qml \QtMinorVersion + import QtMultimedia 5.\1 + \endqml If you intend to use the C++ classes in your application, include the C++ definitions using the following directive: diff --git a/src/multimedia/doc/src/qtmultimedia5.qdoc b/src/multimedia/doc/src/qtmultimedia5.qdoc index 28060a0cc..aec3d99d0 100644 --- a/src/multimedia/doc/src/qtmultimedia5.qdoc +++ b/src/multimedia/doc/src/qtmultimedia5.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! -\qmlmodule QtMultimedia 5.8 +\qmlmodule QtMultimedia 5.\QtMinorVersion \title Qt Multimedia QML Types \ingroup qmlmodules \brief Provides QML types for multimedia support. |