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>
This commit is contained in:
@@ -48,9 +48,6 @@ import QtMultimedia 5.0
|
|||||||
types.
|
types.
|
||||||
|
|
||||||
\qml
|
\qml
|
||||||
import QtQuick 2.0
|
|
||||||
import QtMultimedia 5.0
|
|
||||||
|
|
||||||
Video {
|
Video {
|
||||||
id: video
|
id: video
|
||||||
width : 800
|
width : 800
|
||||||
|
|||||||
@@ -57,12 +57,7 @@ QT_BEGIN_NAMESPACE
|
|||||||
\ingroup multimedia_qml
|
\ingroup multimedia_qml
|
||||||
\ingroup multimedia_audio_qml
|
\ingroup multimedia_audio_qml
|
||||||
|
|
||||||
This type is part of the \b{QtMultimedia 5.0} module.
|
|
||||||
|
|
||||||
\qml
|
\qml
|
||||||
import QtQuick 2.0
|
|
||||||
import QtMultimedia 5.0
|
|
||||||
|
|
||||||
Text {
|
Text {
|
||||||
text: "Click Me!";
|
text: "Click Me!";
|
||||||
font.pointSize: 24;
|
font.pointSize: 24;
|
||||||
@@ -1148,12 +1143,7 @@ void QDeclarativeAudio::_q_statusChanged()
|
|||||||
\ingroup multimedia_audio_qml
|
\ingroup multimedia_audio_qml
|
||||||
\ingroup multimedia_video_qml
|
\ingroup multimedia_video_qml
|
||||||
|
|
||||||
MediaPlayer is part of the \b{QtMultimedia 5.0} module.
|
|
||||||
|
|
||||||
\qml
|
\qml
|
||||||
import QtQuick 2.0
|
|
||||||
import QtMultimedia 5.0
|
|
||||||
|
|
||||||
Text {
|
Text {
|
||||||
text: "Click Me!";
|
text: "Click Me!";
|
||||||
font.pointSize: 24;
|
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.
|
or you can use it in conjunction with a \l VideoOutput for rendering video.
|
||||||
|
|
||||||
\qml
|
\qml
|
||||||
import QtQuick 2.0
|
|
||||||
import QtMultimedia 5.0
|
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
MediaPlayer {
|
MediaPlayer {
|
||||||
id: mediaplayer
|
id: mediaplayer
|
||||||
|
|||||||
@@ -84,10 +84,6 @@ void QDeclarativeCamera::_q_availabilityChanged(QMultimedia::AvailabilityStatus
|
|||||||
viewfinder you can use \l VideoOutput with the Camera set as the source.
|
viewfinder you can use \l VideoOutput with the Camera set as the source.
|
||||||
|
|
||||||
\qml
|
\qml
|
||||||
|
|
||||||
import QtQuick 2.0
|
|
||||||
import QtMultimedia 5.4
|
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
width: 640
|
width: 640
|
||||||
height: 360
|
height: 360
|
||||||
|
|||||||
@@ -57,9 +57,6 @@ QT_BEGIN_NAMESPACE
|
|||||||
and cannot be created directly.
|
and cannot be created directly.
|
||||||
|
|
||||||
\qml
|
\qml
|
||||||
import QtQuick 2.0
|
|
||||||
import QtMultimedia 5.0
|
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
width: 640
|
width: 640
|
||||||
height: 360
|
height: 360
|
||||||
|
|||||||
@@ -44,8 +44,6 @@ QT_BEGIN_NAMESPACE
|
|||||||
\ingroup camera_qml
|
\ingroup camera_qml
|
||||||
\inqmlmodule QtMultimedia
|
\inqmlmodule QtMultimedia
|
||||||
|
|
||||||
This type is part of the \b{QtMultimedia 5.0} module.
|
|
||||||
|
|
||||||
CameraExposure allows you to adjust exposure related settings
|
CameraExposure allows you to adjust exposure related settings
|
||||||
like aperture and shutter speed, metering and ISO speed.
|
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.
|
\c exposure property of the a \l Camera should be used.
|
||||||
|
|
||||||
\qml
|
\qml
|
||||||
import QtQuick 2.0
|
|
||||||
import QtMultimedia 5.0
|
|
||||||
|
|
||||||
Camera {
|
Camera {
|
||||||
id: camera
|
id: camera
|
||||||
|
|||||||
@@ -44,8 +44,6 @@ QT_BEGIN_NAMESPACE
|
|||||||
\ingroup multimedia_qml
|
\ingroup multimedia_qml
|
||||||
\ingroup camera_qml
|
\ingroup camera_qml
|
||||||
|
|
||||||
CameraFlash is part of the \b{QtMultimedia 5.0} module.
|
|
||||||
|
|
||||||
This type allows you to operate the camera flash
|
This type allows you to operate the camera flash
|
||||||
hardware and control the flash mode used. Not all cameras have
|
hardware and control the flash mode used. Not all cameras have
|
||||||
flash hardware (and in some cases it is shared with the
|
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.
|
\c flash property of a \l Camera should be used.
|
||||||
|
|
||||||
\qml
|
\qml
|
||||||
import QtQuick 2.0
|
|
||||||
import QtMultimedia 5.0
|
|
||||||
|
|
||||||
Camera {
|
Camera {
|
||||||
id: camera
|
id: camera
|
||||||
|
|||||||
@@ -44,8 +44,6 @@ QT_BEGIN_NAMESPACE
|
|||||||
\ingroup multimedia_qml
|
\ingroup multimedia_qml
|
||||||
\ingroup camera_qml
|
\ingroup camera_qml
|
||||||
|
|
||||||
CameraFocus is part of the \b{QtMultimedia 5.0} module.
|
|
||||||
|
|
||||||
This type allows control over manual and automatic
|
This type allows control over manual and automatic
|
||||||
focus settings, including information about any parts of the
|
focus settings, including information about any parts of the
|
||||||
camera frame that are selected for autofocusing.
|
camera frame that are selected for autofocusing.
|
||||||
@@ -54,8 +52,6 @@ QT_BEGIN_NAMESPACE
|
|||||||
\c focus property of a \l Camera should be used.
|
\c focus property of a \l Camera should be used.
|
||||||
|
|
||||||
\qml
|
\qml
|
||||||
import QtQuick 2.0
|
|
||||||
import QtMultimedia 5.0
|
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
width: 640
|
width: 640
|
||||||
|
|||||||
@@ -52,8 +52,6 @@ QT_BEGIN_NAMESPACE
|
|||||||
\c imageProcessing property of a \l Camera should be used.
|
\c imageProcessing property of a \l Camera should be used.
|
||||||
|
|
||||||
\qml
|
\qml
|
||||||
import QtQuick 2.0
|
|
||||||
import QtMultimedia 5.0
|
|
||||||
|
|
||||||
Camera {
|
Camera {
|
||||||
id: camera
|
id: camera
|
||||||
|
|||||||
@@ -51,9 +51,6 @@ It is not instantiable; to use it, call the members of the global \c QtMultimedi
|
|||||||
For example:
|
For example:
|
||||||
|
|
||||||
\qml
|
\qml
|
||||||
import QtQuick 2.0
|
|
||||||
import QtMultimedia 5.4
|
|
||||||
|
|
||||||
Camera {
|
Camera {
|
||||||
deviceId: QtMultimedia.defaultCamera.deviceId
|
deviceId: QtMultimedia.defaultCamera.deviceId
|
||||||
}
|
}
|
||||||
@@ -121,9 +118,6 @@ Camera {
|
|||||||
the active camera by selecting one of the items in the list.
|
the active camera by selecting one of the items in the list.
|
||||||
|
|
||||||
\qml
|
\qml
|
||||||
import QtQuick 2.0
|
|
||||||
import QtMultimedia 5.4
|
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
|
|
||||||
Camera {
|
Camera {
|
||||||
|
|||||||
@@ -45,12 +45,7 @@ QT_BEGIN_NAMESPACE
|
|||||||
\ingroup multimedia_radio_qml
|
\ingroup multimedia_radio_qml
|
||||||
\inherits Item
|
\inherits Item
|
||||||
|
|
||||||
Radio is part of the \b{QtMultimedia 5.0} module.
|
|
||||||
|
|
||||||
\qml
|
\qml
|
||||||
import QtQuick 2.0
|
|
||||||
import QtMultimedia 5.0
|
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
width: 320
|
width: 320
|
||||||
height: 480
|
height: 480
|
||||||
|
|||||||
@@ -44,17 +44,12 @@ QT_BEGIN_NAMESPACE
|
|||||||
\ingroup multimedia_radio_qml
|
\ingroup multimedia_radio_qml
|
||||||
\inherits Item
|
\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
|
\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,
|
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
|
\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.
|
you to set whether the radio should tune to alternative frequencies if the current signal strength falls too much.
|
||||||
|
|
||||||
\qml
|
\qml
|
||||||
import QtQuick 2.0
|
|
||||||
import QtMultimedia 5.0
|
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
width: 480
|
width: 480
|
||||||
height: 320
|
height: 320
|
||||||
|
|||||||
@@ -46,16 +46,12 @@ QT_BEGIN_NAMESPACE
|
|||||||
|
|
||||||
\ingroup multimedia_qml
|
\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,
|
In many cases the torch hardware is shared with camera flash functionality,
|
||||||
and might be automatically controlled by the device. You have control over
|
and might be automatically controlled by the device. You have control over
|
||||||
the power level (of course, higher power levels are brighter but reduce
|
the power level (of course, higher power levels are brighter but reduce
|
||||||
battery life significantly).
|
battery life significantly).
|
||||||
|
|
||||||
\qml
|
\qml
|
||||||
import QtQuick 2.0
|
|
||||||
import QtMultimedia 5.0
|
|
||||||
|
|
||||||
Torch {
|
Torch {
|
||||||
power: 75 // 75% of full power
|
power: 75 // 75% of full power
|
||||||
|
|||||||
@@ -83,8 +83,6 @@ QT_BEGIN_NAMESPACE
|
|||||||
\ingroup multimedia_audio_qml
|
\ingroup multimedia_audio_qml
|
||||||
\inqmlmodule QtMultimedia
|
\inqmlmodule QtMultimedia
|
||||||
|
|
||||||
SoundEffect is part of the \b{QtMultimedia 5.0} module.
|
|
||||||
|
|
||||||
This type allows you to play uncompressed audio files (typically WAV files) in
|
This type allows you to play uncompressed audio files (typically WAV files) in
|
||||||
a generally lower latency way, and is suitable for "feedback" type sounds in
|
a generally lower latency way, and is suitable for "feedback" type sounds in
|
||||||
response to user actions (e.g. virtual keyboard sounds, positive or negative
|
response to user actions (e.g. virtual keyboard sounds, positive or negative
|
||||||
|
|||||||
@@ -31,10 +31,10 @@
|
|||||||
**
|
**
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
//! [complete snippet]
|
|
||||||
import QtQuick 2.0
|
import QtQuick 2.0
|
||||||
import QtMultimedia 5.0
|
import QtMultimedia 5.5
|
||||||
|
|
||||||
|
//! [complete snippet]
|
||||||
Text {
|
Text {
|
||||||
text: "Click Me!";
|
text: "Click Me!";
|
||||||
font.pointSize: 24;
|
font.pointSize: 24;
|
||||||
|
|||||||
@@ -102,9 +102,6 @@ In QML, use the \l{QtMultimedia::QtMultimedia::availableCameras}{QtMultimedia.av
|
|||||||
property:
|
property:
|
||||||
|
|
||||||
\qml
|
\qml
|
||||||
import QtQuick 2.0
|
|
||||||
import QtMultimedia 5.4
|
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
property bool isCameraAvailable: QtMultimedia.availableCameras.length > 0
|
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:
|
simple viewfinder:
|
||||||
|
|
||||||
\qml
|
\qml
|
||||||
import QtQuick 2.0
|
|
||||||
import QtMultimedia 5.4
|
|
||||||
|
|
||||||
VideoOutput {
|
VideoOutput {
|
||||||
source: camera
|
source: camera
|
||||||
|
|
||||||
|
|||||||
@@ -177,7 +177,7 @@ what changed, and what you might need to change when porting code.
|
|||||||
\section2 QML Types
|
\section2 QML Types
|
||||||
The QML types are accessed by using:
|
The QML types are accessed by using:
|
||||||
\code
|
\code
|
||||||
import QtMultimedia 5.4
|
import QtMultimedia 5.5
|
||||||
\endcode
|
\endcode
|
||||||
\annotatedlist multimedia_qml
|
\annotatedlist multimedia_qml
|
||||||
The following types are accessed by using \l{Qt Audio Engine QML Types}{Qt Audio Engine}:
|
The following types are accessed by using \l{Qt Audio Engine QML Types}{Qt Audio Engine}:
|
||||||
|
|||||||
@@ -54,10 +54,6 @@
|
|||||||
|
|
||||||
\qml
|
\qml
|
||||||
|
|
||||||
import QtQuick 2.0
|
|
||||||
import QtMultimedia 5.0
|
|
||||||
// ...
|
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
width: 640
|
width: 640
|
||||||
height: 360
|
height: 360
|
||||||
@@ -196,9 +192,6 @@
|
|||||||
|
|
||||||
\qml
|
\qml
|
||||||
|
|
||||||
import QtQuick 2.0
|
|
||||||
import QtMultimedia 5.0
|
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
width: 640
|
width: 640
|
||||||
height: 360
|
height: 360
|
||||||
|
|||||||
@@ -46,7 +46,7 @@
|
|||||||
import statement in your \c {.qml} file.
|
import statement in your \c {.qml} file.
|
||||||
|
|
||||||
\code
|
\code
|
||||||
import QtMultimedia 5.4
|
import QtMultimedia 5.5
|
||||||
\endcode
|
\endcode
|
||||||
|
|
||||||
If you intend to use the C++ classes in your application, include the C++
|
If you intend to use the C++ classes in your application, include the C++
|
||||||
|
|||||||
@@ -26,7 +26,7 @@
|
|||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
\qmlmodule QtMultimedia 5.4
|
\qmlmodule QtMultimedia 5.5
|
||||||
\title Qt Multimedia QML Types
|
\title Qt Multimedia QML Types
|
||||||
\ingroup qmlmodules
|
\ingroup qmlmodules
|
||||||
\brief Provides QML types for multimedia support.
|
\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
|
The QML types can be imported into your application using the following import
|
||||||
statement in your .qml file:
|
statement in your .qml file:
|
||||||
\code
|
\code
|
||||||
import QtMultimedia 5.4
|
import QtMultimedia 5.5
|
||||||
\endcode
|
\endcode
|
||||||
|
|
||||||
\section1 QML types
|
\section1 QML types
|
||||||
|
|||||||
@@ -58,11 +58,7 @@ Q_LOGGING_CATEGORY(qLcVideo, "qt.multimedia.video")
|
|||||||
\ingroup multimedia_video_qml
|
\ingroup multimedia_video_qml
|
||||||
\inqmlmodule QtMultimedia
|
\inqmlmodule QtMultimedia
|
||||||
|
|
||||||
\c VideoOutput is part of the \b{QtMultimedia 5.0} module.
|
|
||||||
|
|
||||||
\qml
|
\qml
|
||||||
import QtQuick 2.0
|
|
||||||
import QtMultimedia 5.0
|
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
width: 800
|
width: 800
|
||||||
|
|||||||
Reference in New Issue
Block a user