summaryrefslogtreecommitdiffstats
path: root/src/multimedia/doc/src
diff options
context:
space:
mode:
authorYoann Lopes <yoann.lopes@theqtcompany.com>2015-08-10 16:21:43 +0200
committerYoann Lopes <yoann.lopes@theqtcompany.com>2015-08-11 13:07:34 +0000
commitb8553dae1d5c14c5f2e2ab6e9758e8abe0045cfe (patch)
tree3c5e3c407ec8ffd52b4dee03262d19a502a0d85c /src/multimedia/doc/src
parenta00c588c70a6f4df6ddaf112a49e9fed763a29e2 (diff)
Doc: update qml module version to 5.5.
And remove import statements from snippets. Change-Id: I109beabd445186f96f0750b6f23fb623c125181e Task-number: QTBUG-47620 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
Diffstat (limited to 'src/multimedia/doc/src')
-rw-r--r--src/multimedia/doc/src/cameraoverview.qdoc6
-rw-r--r--src/multimedia/doc/src/multimedia.qdoc2
-rw-r--r--src/multimedia/doc/src/plugins/qml-multimedia.qdoc7
-rw-r--r--src/multimedia/doc/src/qtmultimedia-index.qdoc2
-rw-r--r--src/multimedia/doc/src/qtmultimedia5.qdoc4
5 files changed, 4 insertions, 17 deletions
diff --git a/src/multimedia/doc/src/cameraoverview.qdoc b/src/multimedia/doc/src/cameraoverview.qdoc
index 2a915a017..449dfebb4 100644
--- a/src/multimedia/doc/src/cameraoverview.qdoc
+++ b/src/multimedia/doc/src/cameraoverview.qdoc
@@ -102,9 +102,6 @@ In QML, use the \l{QtMultimedia::QtMultimedia::availableCameras}{QtMultimedia.av
property:
\qml
-import QtQuick 2.0
-import QtMultimedia 5.4
-
Item {
property bool isCameraAvailable: QtMultimedia.availableCameras.length > 0
}
@@ -163,9 +160,6 @@ In QML, you can use \l Camera and \l VideoOutput together to show a
simple viewfinder:
\qml
-import QtQuick 2.0
-import QtMultimedia 5.4
-
VideoOutput {
source: camera
diff --git a/src/multimedia/doc/src/multimedia.qdoc b/src/multimedia/doc/src/multimedia.qdoc
index 1988cc92c..23c2ee431 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.4
+import QtMultimedia 5.5
\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/plugins/qml-multimedia.qdoc b/src/multimedia/doc/src/plugins/qml-multimedia.qdoc
index c15ff9048..15c6d3c1d 100644
--- a/src/multimedia/doc/src/plugins/qml-multimedia.qdoc
+++ b/src/multimedia/doc/src/plugins/qml-multimedia.qdoc
@@ -54,10 +54,6 @@
\qml
- import QtQuick 2.0
- import QtMultimedia 5.0
- // ...
-
Item {
width: 640
height: 360
@@ -196,9 +192,6 @@
\qml
- import QtQuick 2.0
- import QtMultimedia 5.0
-
Item {
width: 640
height: 360
diff --git a/src/multimedia/doc/src/qtmultimedia-index.qdoc b/src/multimedia/doc/src/qtmultimedia-index.qdoc
index 6dc894295..82dc0b1b2 100644
--- a/src/multimedia/doc/src/qtmultimedia-index.qdoc
+++ b/src/multimedia/doc/src/qtmultimedia-index.qdoc
@@ -46,7 +46,7 @@
import statement in your \c {.qml} file.
\code
- import QtMultimedia 5.4
+ import QtMultimedia 5.5
\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 0cdd54a2b..0d3e087a0 100644
--- a/src/multimedia/doc/src/qtmultimedia5.qdoc
+++ b/src/multimedia/doc/src/qtmultimedia5.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
-\qmlmodule QtMultimedia 5.4
+\qmlmodule QtMultimedia 5.5
\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.4
+import QtMultimedia 5.5
\endcode
\section1 QML types