diff options
20 files changed, 6 insertions, 82 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 diff --git a/src/multimedia/audio/qsoundeffect.cpp b/src/multimedia/audio/qsoundeffect.cpp index b3bba2000..865d40753 100644 --- a/src/multimedia/audio/qsoundeffect.cpp +++ b/src/multimedia/audio/qsoundeffect.cpp @@ -83,8 +83,6 @@ QT_BEGIN_NAMESPACE \ingroup multimedia_audio_qml \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 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 diff --git a/src/multimedia/doc/snippets/multimedia-snippets/soundeffect.qml b/src/multimedia/doc/snippets/multimedia-snippets/soundeffect.qml index f30459ccc..54205ca6f 100644 --- a/src/multimedia/doc/snippets/multimedia-snippets/soundeffect.qml +++ b/src/multimedia/doc/snippets/multimedia-snippets/soundeffect.qml @@ -31,10 +31,10 @@ ** ****************************************************************************/ -//! [complete snippet] import QtQuick 2.0 -import QtMultimedia 5.0 +import QtMultimedia 5.5 +//! [complete snippet] Text { text: "Click Me!"; font.pointSize: 24; 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 diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp b/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp index 7a9dfdaa7..cae6cf002 100644 --- a/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp +++ b/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp @@ -58,11 +58,7 @@ Q_LOGGING_CATEGORY(qLcVideo, "qt.multimedia.video") \ingroup multimedia_video_qml \inqmlmodule QtMultimedia - \c VideoOutput is part of the \b{QtMultimedia 5.0} module. - \qml - import QtQuick 2.0 - import QtMultimedia 5.0 Rectangle { width: 800 |