diff options
author | Jonas Rabbe <jonas.rabbe@nokia.com> | 2012-01-11 12:12:55 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-11 04:11:48 +0100 |
commit | 3d88a055d03dc680ef0960aba872d2c9f67301fb (patch) | |
tree | e7b68daefb95baf083fedd5d9ba172678ffee2ba /src | |
parent | 99b80809c737cb6eb0577788a94d06f8429f4d1b (diff) |
Updated QtMultimedia declarative module to version 5.0
The QtMultimedia module should have version 5.0 to align with
Qt 5 in general. This change updates the version, but keeps
4.0 versions of the elements for compatability purposes.
Documentation and examples has also been updated to reflect
this version change.
Change-Id: Ica10c1a5ecc2c7233192a65e04ff77eb33a77e30
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/multimedia/Video.qml | 2 | ||||
-rw-r--r-- | src/imports/multimedia/multimedia.cpp | 24 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativeaudio.cpp | 6 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativecamera.cpp | 6 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativecameraexposure.cpp | 6 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativecameraflash.cpp | 6 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativecamerafocus.cpp | 6 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativevideo.cpp | 6 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativevideooutput.cpp | 5 | ||||
-rw-r--r-- | src/imports/multimedia/qmldir | 2 | ||||
-rw-r--r-- | src/multimedia/audio/qsoundeffect.cpp | 2 |
11 files changed, 48 insertions, 23 deletions
diff --git a/src/imports/multimedia/Video.qml b/src/imports/multimedia/Video.qml index 3c96bcd7e..4fafc0ea4 100644 --- a/src/imports/multimedia/Video.qml +++ b/src/imports/multimedia/Video.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtMultimedia 4.0 +import QtMultimedia 5.0 Item { id: video diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp index 6766f5871..9e6e0c177 100644 --- a/src/imports/multimedia/multimedia.cpp +++ b/src/imports/multimedia/multimedia.cpp @@ -92,6 +92,30 @@ public: trUtf8("CameraFlash is only provided by Camera element")); qmlRegisterUncreatableType<QDeclarativeCameraImageProcessing>(uri, 4, 0, "CameraImageProcessing", trUtf8("CameraImageProcessing is only provided by Camera element")); + + // Introduced to help transition from QtMultimedia 4.0 to 5.0 (official for Qt 5) + // the 4.0 versioned types will be removed once all clients have made the transition. + qmlRegisterType<QSoundEffect>(uri, 5, 0, "SoundEffect"); + qmlRegisterType<QDeclarativeAudio>(uri, 5, 0, "Audio"); + qmlRegisterType<QDeclarativeAudio>(uri, 5, 0, "MediaPlayer"); + qmlRegisterType<QDeclarativeVideoOutput>(uri, 5, 0, "VideoOutput"); + qmlRegisterType<QDeclarativeRadio>(uri, 5, 0, "Radio"); + qmlRegisterType<QDeclarativeRadioData>(uri, 5, 0, "RadioData"); + qmlRegisterType<QDeclarativeBackgroundAudio>(uri, 5, 0, "BackgroundAudio"); + qmlRegisterType<QDeclarativeCamera>(uri, 5, 0, "Camera"); + qmlRegisterUncreatableType<QDeclarativeCameraCapture>(uri, 5, 0, "CameraCapture", + trUtf8("CameraCapture is only provided by Camera element")); + qmlRegisterUncreatableType<QDeclarativeCameraRecorder>(uri, 5, 0, "CameraRecorder", + trUtf8("CameraRecorder is only provided by Camera element")); + qmlRegisterUncreatableType<QDeclarativeCameraExposure>(uri, 5, 0, "CameraExposure", + trUtf8("CameraExposure is only provided by Camera element")); + qmlRegisterUncreatableType<QDeclarativeCameraFocus>(uri, 5, 0, "CameraFocus", + trUtf8("CameraFocus is only provided by Camera element")); + qmlRegisterUncreatableType<QDeclarativeCameraFlash>(uri, 5, 0, "CameraFlash", + trUtf8("CameraFlash is only provided by Camera element")); + qmlRegisterUncreatableType<QDeclarativeCameraImageProcessing>(uri, 5, 0, "CameraImageProcessing", + trUtf8("CameraImageProcessing is only provided by Camera element")); + qmlRegisterType<QDeclarativeMediaMetaData>(); } diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp index 79709ba18..8153db0ac 100644 --- a/src/imports/multimedia/qdeclarativeaudio.cpp +++ b/src/imports/multimedia/qdeclarativeaudio.cpp @@ -52,11 +52,11 @@ QT_BEGIN_NAMESPACE \ingroup qml-multimedia - This element is part of the \bold{QtMultimedia 4.0} module. + This element is part of the \bold{QtMultimedia 5.0} module. \qml - import Qt 4.7 - import QtMultimedia 4.0 + import QtQuick 2.0 + import QtMultimedia 5.0 Text { text: "Click Me!"; diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp index 71b3b0697..96251a1ed 100644 --- a/src/imports/multimedia/qdeclarativecamera.cpp +++ b/src/imports/multimedia/qdeclarativecamera.cpp @@ -75,11 +75,11 @@ void QDeclarativeCamera::_q_updateState(QCamera::State state) \ingroup qml-multimedia \inherits Item - This element is part of the \bold{QtMultimedia 4.0} module. + This element is part of the \bold{QtMultimedia 5.0} module. \qml - import Qt 4.7 - import QtMultimedia 4.0 + import QtQuick 2.0 + import QtMultimedia 5.0 Camera { id: camera diff --git a/src/imports/multimedia/qdeclarativecameraexposure.cpp b/src/imports/multimedia/qdeclarativecameraexposure.cpp index 79d939e83..e9f04de2c 100644 --- a/src/imports/multimedia/qdeclarativecameraexposure.cpp +++ b/src/imports/multimedia/qdeclarativecameraexposure.cpp @@ -46,17 +46,17 @@ QT_BEGIN_NAMESPACE /*! \qmlclass CameraExposure QDeclarativeCameraExposure - \since 4.0 + \since 5.0 \brief The CameraExposure element provides interface for exposure related camera settings. \ingroup qml-multimedia - This element is part of the \bold{QtMultimedia 4.0} module. + This element is part of the \bold{QtMultimedia 5.0} module. It should not be constructed separately but provided by Camera.exposure. \qml import QtQuick 2.0 - import QtMultimedia 4.0 + import QtMultimedia 5.0 Camera { id: camera diff --git a/src/imports/multimedia/qdeclarativecameraflash.cpp b/src/imports/multimedia/qdeclarativecameraflash.cpp index 08cbc81ef..b630bdaea 100644 --- a/src/imports/multimedia/qdeclarativecameraflash.cpp +++ b/src/imports/multimedia/qdeclarativecameraflash.cpp @@ -46,17 +46,17 @@ QT_BEGIN_NAMESPACE /*! \qmlclass CameraFlash QDeclarativeCameraFlash - \since 4.0 + \since 5.0 \brief The CameraFlash element provides interface for flash related camera settings. \ingroup qml-multimedia - This element is part of the \bold{QtMultimedia 4.0} module. + This element is part of the \bold{QtMultimedia 5.0} module. It should not be constructed separately but provided by Camera.flash. \qml import QtQuick 2.0 - import QtMultimedia 4.0 + import QtMultimedia 5.0 Camera { id: camera diff --git a/src/imports/multimedia/qdeclarativecamerafocus.cpp b/src/imports/multimedia/qdeclarativecamerafocus.cpp index 4a74165ff..d0ff64474 100644 --- a/src/imports/multimedia/qdeclarativecamerafocus.cpp +++ b/src/imports/multimedia/qdeclarativecamerafocus.cpp @@ -46,17 +46,17 @@ QT_BEGIN_NAMESPACE /*! \qmlclass CameraFocus QDeclarativeCameraFocus - \since 4.0 + \since 5.0 \brief The CameraFocus element provides interface for focus related camera settings. \ingroup qml-multimedia - This element is part of the \bold{QtMultimedia 4.0} module. + This element is part of the \bold{QtMultimedia 5.0} module. It should not be constructed separately but provided by Camera.focus. \qml import QtQuick 2.0 - import QtMultimedia 4.0 + import QtMultimedia 5.0 Camera { id: camera diff --git a/src/imports/multimedia/qdeclarativevideo.cpp b/src/imports/multimedia/qdeclarativevideo.cpp index 956d1d796..1e57ad788 100644 --- a/src/imports/multimedia/qdeclarativevideo.cpp +++ b/src/imports/multimedia/qdeclarativevideo.cpp @@ -72,11 +72,11 @@ void QDeclarativeVideo::_q_error(int errorCode, const QString &errorString) \inherits Item \ingroup qml-multimedia - This element is part of the \bold{QtMultimedia 4.0} module. + This element is part of the \bold{QtMultimedia 5.0} module. \qml - import Qt 4.7 - import QtMultimedia 4.0 + import QtQuick 2.0 + import QtMultimedia 5.0 Video { id: video diff --git a/src/imports/multimedia/qdeclarativevideooutput.cpp b/src/imports/multimedia/qdeclarativevideooutput.cpp index 6e2e8c88d..51e74998f 100644 --- a/src/imports/multimedia/qdeclarativevideooutput.cpp +++ b/src/imports/multimedia/qdeclarativevideooutput.cpp @@ -118,14 +118,15 @@ private: /*! \qmlclass VideoOutput QDeclarativeVideoOutput \brief The VideoOutput element allows you to render video or camera viewfinder. + \since 5.0.0 \ingroup qml-multimedia - This element is part of the \bold{QtMultimedia 4.0} module. + This element is part of the \bold{QtMultimedia 5.0} module. \qml import QtQuick 2.0 - import QtMultimedia 4.0 + import QtMultimedia 5.0 Rectangle { width: 800 diff --git a/src/imports/multimedia/qmldir b/src/imports/multimedia/qmldir index 8eff6b7ff..369d6a651 100644 --- a/src/imports/multimedia/qmldir +++ b/src/imports/multimedia/qmldir @@ -1,2 +1,2 @@ plugin declarative_multimedia -Video 4.0 Video.qml +Video 5.0 Video.qml diff --git a/src/multimedia/audio/qsoundeffect.cpp b/src/multimedia/audio/qsoundeffect.cpp index b1c359ef0..ee1b99ce8 100644 --- a/src/multimedia/audio/qsoundeffect.cpp +++ b/src/multimedia/audio/qsoundeffect.cpp @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE \inmodule QtMultimedia - This element is part of the \bold{QtMultimedia 4.0} module. + This element is part of the \bold{QtMultimedia 5.0} module. The following example plays a WAV file on mouse click. |