slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Doc: update qml module version to 5.5.

Browse Source 
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>
This commit is contained in:
Yoann Lopes
2015-08-10 16:21:43 +02:00
parent a00c588c70
commit b8553dae1d
20 changed files with 6 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/imports/multimedia/Video.qml
View File

@@ -48,9 +48,6 @@ import QtMultimedia 5.0
types.
\qml
import QtQuick 2.0
import QtMultimedia 5.0
Video {
id: video
width : 800

13
src/imports/multimedia/qdeclarativeaudio.cpp
View File

@@ -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

4
src/imports/multimedia/qdeclarativecamera.cpp
View File

@@ -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

3
src/imports/multimedia/qdeclarativecameracapture.cpp
View File

@@ -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

4
src/imports/multimedia/qdeclarativecameraexposure.cpp
View File

@@ -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

4
src/imports/multimedia/qdeclarativecameraflash.cpp
View File

@@ -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

4
src/imports/multimedia/qdeclarativecamerafocus.cpp
View File

@@ -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

2
src/imports/multimedia/qdeclarativecameraimageprocessing.cpp
View File

@@ -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

6
src/imports/multimedia/qdeclarativemultimediaglobal.cpp
View File

@@ -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 {

5
src/imports/multimedia/qdeclarativeradio.cpp
View File

@@ -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

5
src/imports/multimedia/qdeclarativeradiodata.cpp
View File

@@ -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

4
src/imports/multimedia/qdeclarativetorch.cpp
View File

@@ -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