diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 14:26:15 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 14:26:22 +0100 |
commit | e757890f4a5669b396039211902224f31666725a (patch) | |
tree | bb220ff8b9d8d4a64ce5f197a4b39e3e5965da63 /src/multimedia/doc/src/qtmultimedia-index.qdoc | |
parent | caf0cbca71231dbb6403108ba41d2117d3ce6c6d (diff) | |
parent | 71a6b1b62041981f894cb2b6589fce92f137bbc4 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ieb1a3081907093e31e8c8b7f95993bb3b2173672
Diffstat (limited to 'src/multimedia/doc/src/qtmultimedia-index.qdoc')
-rw-r--r-- | src/multimedia/doc/src/qtmultimedia-index.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/doc/src/qtmultimedia-index.qdoc b/src/multimedia/doc/src/qtmultimedia-index.qdoc index e51ec97e0..989b8886e 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.5 + import QtMultimedia 5.6 \endcode If you intend to use the C++ classes in your application, include the C++ |