summaryrefslogtreecommitdiffstats
path: root/src/imports
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/imports
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/imports')
-rw-r--r--src/imports/multimedia/Video.qml3
-rw-r--r--src/imports/multimedia/qdeclarativeaudio.cpp13
-rw-r--r--src/imports/multimedia/qdeclarativecamera.cpp4
-rw-r--r--src/imports/multimedia/qdeclarativecameracapture.cpp3
-rw-r--r--src/imports/multimedia/qdeclarativecameraexposure.cpp4
-rw-r--r--src/imports/multimedia/qdeclarativecameraflash.cpp4
-rw-r--r--src/imports/multimedia/qdeclarativecamerafocus.cpp4
-rw-r--r--src/imports/multimedia/qdeclarativecameraimageprocessing.cpp2
-rw-r--r--src/imports/multimedia/qdeclarativemultimediaglobal.cpp6
-rw-r--r--src/imports/multimedia/qdeclarativeradio.cpp5
-rw-r--r--src/imports/multimedia/qdeclarativeradiodata.cpp5
-rw-r--r--src/imports/multimedia/qdeclarativetorch.cpp4
12 files changed, 0 insertions, 57 deletions
diff --git a/src/imports/multimedia/Video.qml b/src/imports/multimedia/Video.qml
index f609c3f14..84abeb08f 100644
--- a/src/imports/multimedia/Video.qml
+++ b/src/imports/multimedia/Video.qml
@@ -48,9 +48,6 @@ import QtMultimedia 5.0
types.
\qml
- import QtQuick 2.0
- import QtMultimedia 5.0
-
Video {
id: video
width : 800
diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp
index 17d57ffb7..e724dfbc6 100644
--- a/src/imports/multimedia/qdeclarativeaudio.cpp
+++ b/src/imports/multimedia/qdeclarativeaudio.cpp
@@ -57,12 +57,7 @@ QT_BEGIN_NAMESPACE
\ingroup multimedia_qml
\ingroup multimedia_audio_qml
- This type is part of the \b{QtMultimedia 5.0} module.
-
\qml
- import QtQuick 2.0
- import QtMultimedia 5.0
-
Text {
text: "Click Me!";
font.pointSize: 24;
@@ -1148,12 +1143,7 @@ void QDeclarativeAudio::_q_statusChanged()
\ingroup multimedia_audio_qml
\ingroup multimedia_video_qml
- MediaPlayer is part of the \b{QtMultimedia 5.0} module.
-
\qml
- import QtQuick 2.0
- import QtMultimedia 5.0
-
Text {
text: "Click Me!";
font.pointSize: 24;
@@ -1175,9 +1165,6 @@ void QDeclarativeAudio::_q_statusChanged()
or you can use it in conjunction with a \l VideoOutput for rendering video.
\qml
- import QtQuick 2.0
- import QtMultimedia 5.0
-
Item {
MediaPlayer {
id: mediaplayer
diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp
index d3faf8db8..3f67a8e94 100644
--- a/src/imports/multimedia/qdeclarativecamera.cpp
+++ b/src/imports/multimedia/qdeclarativecamera.cpp
@@ -84,10 +84,6 @@ void QDeclarativeCamera::_q_availabilityChanged(QMultimedia::AvailabilityStatus
viewfinder you can use \l VideoOutput with the Camera set as the source.
\qml
-
- import QtQuick 2.0
- import QtMultimedia 5.4
-
Item {
width: 640
height: 360
diff --git a/src/imports/multimedia/qdeclarativecameracapture.cpp b/src/imports/multimedia/qdeclarativecameracapture.cpp
index 790d969e7..7bd56be57 100644
--- a/src/imports/multimedia/qdeclarativecameracapture.cpp
+++ b/src/imports/multimedia/qdeclarativecameracapture.cpp
@@ -57,9 +57,6 @@ QT_BEGIN_NAMESPACE
and cannot be created directly.
\qml
- import QtQuick 2.0
- import QtMultimedia 5.0
-
Item {
width: 640
height: 360
diff --git a/src/imports/multimedia/qdeclarativecameraexposure.cpp b/src/imports/multimedia/qdeclarativecameraexposure.cpp
index abd2853cf..4f820219e 100644
--- a/src/imports/multimedia/qdeclarativecameraexposure.cpp
+++ b/src/imports/multimedia/qdeclarativecameraexposure.cpp
@@ -44,8 +44,6 @@ QT_BEGIN_NAMESPACE
\ingroup camera_qml
\inqmlmodule QtMultimedia
- This type is part of the \b{QtMultimedia 5.0} module.
-
CameraExposure allows you to adjust exposure related settings
like aperture and shutter speed, metering and ISO speed.
@@ -53,8 +51,6 @@ QT_BEGIN_NAMESPACE
\c exposure property of the a \l Camera should be used.
\qml
- import QtQuick 2.0
- import QtMultimedia 5.0
Camera {
id: camera
diff --git a/src/imports/multimedia/qdeclarativecameraflash.cpp b/src/imports/multimedia/qdeclarativecameraflash.cpp
index ae4fd9394..966ef7ee2 100644
--- a/src/imports/multimedia/qdeclarativecameraflash.cpp
+++ b/src/imports/multimedia/qdeclarativecameraflash.cpp
@@ -44,8 +44,6 @@ QT_BEGIN_NAMESPACE
\ingroup multimedia_qml
\ingroup camera_qml
- CameraFlash is part of the \b{QtMultimedia 5.0} module.
-
This type allows you to operate the camera flash
hardware and control the flash mode used. Not all cameras have
flash hardware (and in some cases it is shared with the
@@ -55,8 +53,6 @@ QT_BEGIN_NAMESPACE
\c flash property of a \l Camera should be used.
\qml
- import QtQuick 2.0
- import QtMultimedia 5.0
Camera {
id: camera
diff --git a/src/imports/multimedia/qdeclarativecamerafocus.cpp b/src/imports/multimedia/qdeclarativecamerafocus.cpp
index cea9ffc32..948151e99 100644
--- a/src/imports/multimedia/qdeclarativecamerafocus.cpp
+++ b/src/imports/multimedia/qdeclarativecamerafocus.cpp
@@ -44,8 +44,6 @@ QT_BEGIN_NAMESPACE
\ingroup multimedia_qml
\ingroup camera_qml
- CameraFocus is part of the \b{QtMultimedia 5.0} module.
-
This type allows control over manual and automatic
focus settings, including information about any parts of the
camera frame that are selected for autofocusing.
@@ -54,8 +52,6 @@ QT_BEGIN_NAMESPACE
\c focus property of a \l Camera should be used.
\qml
- import QtQuick 2.0
- import QtMultimedia 5.0
Item {
width: 640
diff --git a/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp b/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp
index 4f37efedd..d31ea7a09 100644
--- a/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp
+++ b/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp
@@ -52,8 +52,6 @@ QT_BEGIN_NAMESPACE
\c imageProcessing property of a \l Camera should be used.
\qml
- import QtQuick 2.0
- import QtMultimedia 5.0
Camera {
id: camera
diff --git a/src/imports/multimedia/qdeclarativemultimediaglobal.cpp b/src/imports/multimedia/qdeclarativemultimediaglobal.cpp
index 1717d05f3..4206926a5 100644
--- a/src/imports/multimedia/qdeclarativemultimediaglobal.cpp
+++ b/src/imports/multimedia/qdeclarativemultimediaglobal.cpp
@@ -51,9 +51,6 @@ It is not instantiable; to use it, call the members of the global \c QtMultimedi
For example:
\qml
-import QtQuick 2.0
-import QtMultimedia 5.4
-
Camera {
deviceId: QtMultimedia.defaultCamera.deviceId
}
@@ -121,9 +118,6 @@ Camera {
the active camera by selecting one of the items in the list.
\qml
- import QtQuick 2.0
- import QtMultimedia 5.4
-
Item {
Camera {
diff --git a/src/imports/multimedia/qdeclarativeradio.cpp b/src/imports/multimedia/qdeclarativeradio.cpp
index 1d8ff9da5..e6bf5def2 100644
--- a/src/imports/multimedia/qdeclarativeradio.cpp
+++ b/src/imports/multimedia/qdeclarativeradio.cpp
@@ -45,12 +45,7 @@ QT_BEGIN_NAMESPACE
\ingroup multimedia_radio_qml
\inherits Item
- Radio is part of the \b{QtMultimedia 5.0} module.
-
\qml
- import QtQuick 2.0
- import QtMultimedia 5.0
-
Rectangle {
width: 320
height: 480
diff --git a/src/imports/multimedia/qdeclarativeradiodata.cpp b/src/imports/multimedia/qdeclarativeradiodata.cpp
index 82e3c31b3..51d3bb877 100644
--- a/src/imports/multimedia/qdeclarativeradiodata.cpp
+++ b/src/imports/multimedia/qdeclarativeradiodata.cpp
@@ -44,17 +44,12 @@ QT_BEGIN_NAMESPACE
\ingroup multimedia_radio_qml
\inherits Item
- This type is part of the \b{QtMultimedia 5.0} module.
-
\c RadioData is your gateway to all the data available through RDS. RDS is the Radio Data System
which allows radio stations to broadcast information like the \l stationId, \l programType, \l programTypeName,
\l stationName, and \l radioText. This information can be read from the \c RadioData. It also allows
you to set whether the radio should tune to alternative frequencies if the current signal strength falls too much.
\qml
- import QtQuick 2.0
- import QtMultimedia 5.0
-
Rectangle {
width: 480
height: 320
diff --git a/src/imports/multimedia/qdeclarativetorch.cpp b/src/imports/multimedia/qdeclarativetorch.cpp
index 5a0b12081..fdf4dcce4 100644
--- a/src/imports/multimedia/qdeclarativetorch.cpp
+++ b/src/imports/multimedia/qdeclarativetorch.cpp
@@ -46,16 +46,12 @@ QT_BEGIN_NAMESPACE
\ingroup multimedia_qml
- \c Torch is part of the \b{QtMultimedia 5.0} module.
-
In many cases the torch hardware is shared with camera flash functionality,
and might be automatically controlled by the device. You have control over
the power level (of course, higher power levels are brighter but reduce
battery life significantly).
\qml
- import QtQuick 2.0
- import QtMultimedia 5.0
Torch {
power: 75 // 75% of full power