diff --git a/doc/src/examples/qmlvideofx.qdoc b/doc/src/examples/qmlvideofx.qdoc index af0a5d367827a1da30fd05a531504ac3d20d53cd..5705ba9d1c6ea5b5a725bf001570204387c5c043 100644 --- a/doc/src/examples/qmlvideofx.qdoc +++ b/doc/src/examples/qmlvideofx.qdoc @@ -77,7 +77,7 @@ a wiggly effect to the content: \code import QtQuick 2.0 -import QtMultimedia 4.0 +import QtMultimedia 5.0 Rectangle { width: 300 diff --git a/doc/src/plugins/qml-multimedia.qdoc b/doc/src/plugins/qml-multimedia.qdoc index b539cf499572c27951bf5dcc144178a22fd4c284..84020efa1735bc1343e93cbfe5ad763ea0893bea 100644 --- a/doc/src/plugins/qml-multimedia.qdoc +++ b/doc/src/plugins/qml-multimedia.qdoc @@ -54,8 +54,8 @@ \qml - import Qt 4.7 - import QtMultimedia 4.0 + import QtQuick 2.0 + import QtMultimedia 5.0 // ... Audio { @@ -237,8 +237,8 @@ \qml - import Qt 4.7 - import QtMultimedia 4.0 + import QtQuick 2.0 + import QtMultimedia 5.0 SoundEffect { @@ -264,8 +264,8 @@ including white balance, exposure compensation and flash mode, and control zoom. \qml - import Qt 4.7 - import QtMultimedia 4.0 + import QtQuick 2.0 + import QtMultimedia 5.0 Camera { focus : visible // to receive focus and capture key events when visible diff --git a/doc/src/snippets/multimedia-snippets/soundeffect.qml b/doc/src/snippets/multimedia-snippets/soundeffect.qml index 8acd7c257bfbe3a59d75b53fa83111b593f9579d..dc42369ec177da2dac0d084309c82cd66d2dd3de 100644 --- a/doc/src/snippets/multimedia-snippets/soundeffect.qml +++ b/doc/src/snippets/multimedia-snippets/soundeffect.qml @@ -40,8 +40,8 @@ ****************************************************************************/ //! [complete snippet] -import Qt 4.7 -import QtMultimedia 4.0 +import QtQuick 2.0 +import QtMultimedia 5.0 Text { text: "Click Me!"; diff --git a/examples/declarative-camera/CameraButton.qml b/examples/declarative-camera/CameraButton.qml index 4b2c663e9302ba398dfb718f7026239b7c700333..7fb4999e9a480dc089468d9a7680edf432559bce 100644 --- a/examples/declarative-camera/CameraButton.qml +++ b/examples/declarative-camera/CameraButton.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 2.0 Item { id: button diff --git a/examples/declarative-camera/CameraPropertyButton.qml b/examples/declarative-camera/CameraPropertyButton.qml index 152bb937556f474de97e65167d3feac87f5040ea..537a96fd159a93b64bcef4c95333124ea40ae1ba 100644 --- a/examples/declarative-camera/CameraPropertyButton.qml +++ b/examples/declarative-camera/CameraPropertyButton.qml @@ -38,8 +38,8 @@ ** ****************************************************************************/ -import Qt 4.7 -import QtMultimedia 4.0 +import QtQuick 2.0 +import QtMultimedia 5.0 Item { id: propertyButton diff --git a/examples/declarative-camera/CameraPropertyPopup.qml b/examples/declarative-camera/CameraPropertyPopup.qml index f101b69ce551a655b4aba6b503db5c3660f51ac2..c86db3bf80a5eba847decd179db471ffd86c124a 100644 --- a/examples/declarative-camera/CameraPropertyPopup.qml +++ b/examples/declarative-camera/CameraPropertyPopup.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 2.0 Rectangle { id: propertyPopup diff --git a/examples/declarative-camera/CaptureControls.qml b/examples/declarative-camera/CaptureControls.qml index 6120dad012d30a8fb945f2e7c6698e98266e1d75..6c345611d0d6dcc6c2a465f6e9e1cb22f384fd70 100644 --- a/examples/declarative-camera/CaptureControls.qml +++ b/examples/declarative-camera/CaptureControls.qml @@ -38,8 +38,8 @@ ** ****************************************************************************/ -import Qt 4.7 -import QtMultimedia 4.0 +import QtQuick 2.0 +import QtMultimedia 5.0 FocusScope { property Camera camera diff --git a/examples/declarative-camera/ExposureCompensationButton.qml b/examples/declarative-camera/ExposureCompensationButton.qml index cf6fc5db77f0ee74c7cf769d1e5da1da89fd9ba9..7fb4fbeba9a1635a5f4279d570e078316553a275 100644 --- a/examples/declarative-camera/ExposureCompensationButton.qml +++ b/examples/declarative-camera/ExposureCompensationButton.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 2.0 Item { id: exposureCompensation diff --git a/examples/declarative-camera/FlickableList.qml b/examples/declarative-camera/FlickableList.qml index d39519e4e4f3dd037fc475a73131cf5fe28701e9..b59e03cda6db61d7a36aa803b34b3f4ea509b4c9 100644 --- a/examples/declarative-camera/FlickableList.qml +++ b/examples/declarative-camera/FlickableList.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 2.0 Item { id: flickableList diff --git a/examples/declarative-camera/FocusButton.qml b/examples/declarative-camera/FocusButton.qml index 6a54c8d22669ec0778f817a98ab570f98a2e68e2..9955601072251104f5c463539191cd87a4b67712 100644 --- a/examples/declarative-camera/FocusButton.qml +++ b/examples/declarative-camera/FocusButton.qml @@ -38,8 +38,8 @@ ** ****************************************************************************/ -import Qt 4.7 -import QtMultimedia 4.0 +import QtQuick 2.0 +import QtMultimedia 5.0 CameraButton { property Camera camera diff --git a/examples/declarative-camera/PhotoPreview.qml b/examples/declarative-camera/PhotoPreview.qml index 6cd7f35b06bf5a3f5fa41022936b638f2e86a998..9945c029cc847765e3b3a533bfd68cda38c2b70b 100644 --- a/examples/declarative-camera/PhotoPreview.qml +++ b/examples/declarative-camera/PhotoPreview.qml @@ -38,8 +38,8 @@ ** ****************************************************************************/ -import Qt 4.7 -import QtMultimedia 4.0 +import QtQuick 2.0 +import QtMultimedia 5.0 Item { property alias source : preview.source diff --git a/examples/declarative-camera/ZoomControl.qml b/examples/declarative-camera/ZoomControl.qml index b141523c1318942d6f3bb709eedf9089a62c0dc7..8af9e77f25c9a1b1386062ecb72c73138a1b9995 100644 --- a/examples/declarative-camera/ZoomControl.qml +++ b/examples/declarative-camera/ZoomControl.qml @@ -38,8 +38,8 @@ ** ****************************************************************************/ -import Qt 4.7 -import QtMultimedia 4.0 +import QtQuick 2.0 +import QtMultimedia 5.0 Item { id : zoomControl diff --git a/examples/declarative-camera/declarative-camera.qml b/examples/declarative-camera/declarative-camera.qml index fdc210de6dc256baad8d36bffbfc8ea157b4a59b..03713fb434fbe4f8b45d14e01cb271256946a50a 100644 --- a/examples/declarative-camera/declarative-camera.qml +++ b/examples/declarative-camera/declarative-camera.qml @@ -38,8 +38,8 @@ ** ****************************************************************************/ -import Qt 4.7 -import QtMultimedia 4.0 +import QtQuick 2.0 +import QtMultimedia 5.0 Rectangle { id : cameraUI diff --git a/examples/declarative-radio/view.qml b/examples/declarative-radio/view.qml index e1fcb7130567f853db7d723b832af2c67fbcf21c..0c7736106bff89288e5c9e36d151d82903e74768 100644 --- a/examples/declarative-radio/view.qml +++ b/examples/declarative-radio/view.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt.multimedia 4.0 +import QtMultimedia 5.0 Rectangle { width: 400; height: 300; diff --git a/examples/video/qmlvideo/qml/qmlvideo/CameraItem.qml b/examples/video/qmlvideo/qml/qmlvideo/CameraItem.qml index cb157b77b9f4ddc17552ad8ed1239f5c471b7ced..a898b842b3b7929daa3982f098c04094482fdbbb 100644 --- a/examples/video/qmlvideo/qml/qmlvideo/CameraItem.qml +++ b/examples/video/qmlvideo/qml/qmlvideo/CameraItem.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtMultimedia 4.0 +import QtMultimedia 5.0 VideoOutput { id: root diff --git a/examples/video/qmlvideo/qml/qmlvideo/VideoFillMode.qml b/examples/video/qmlvideo/qml/qmlvideo/VideoFillMode.qml index 9c5fb74448c1e03cd869b25ab801c10d4798c0b8..cb8314d6acf0bd3099c3de470fc08197c4117e91 100644 --- a/examples/video/qmlvideo/qml/qmlvideo/VideoFillMode.qml +++ b/examples/video/qmlvideo/qml/qmlvideo/VideoFillMode.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtMultimedia 4.0 +import QtMultimedia 5.0 Scene { id: root diff --git a/examples/video/qmlvideo/qml/qmlvideo/VideoItem.qml b/examples/video/qmlvideo/qml/qmlvideo/VideoItem.qml index 632f8f3a900eea5fcead6073fced79b9c9976c19..a4c37b2831d4e73dd0894119993107d75ab9c161 100644 --- a/examples/video/qmlvideo/qml/qmlvideo/VideoItem.qml +++ b/examples/video/qmlvideo/qml/qmlvideo/VideoItem.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtMultimedia 4.0 +import QtMultimedia 5.0 VideoOutput { id: root diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/ContentCamera.qml b/examples/video/qmlvideofx/qml/qmlvideofx/ContentCamera.qml index cfb0e574af76484194870df9bef1f63549996e7c..3d9cec1ed3ba4e231e686c3b9eea49de67d1e951 100644 --- a/examples/video/qmlvideofx/qml/qmlvideofx/ContentCamera.qml +++ b/examples/video/qmlvideofx/qml/qmlvideofx/ContentCamera.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtMultimedia 4.0 +import QtMultimedia 5.0 VideoOutput { source: camera diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/ContentVideo.qml b/examples/video/qmlvideofx/qml/qmlvideofx/ContentVideo.qml index 4e7f37b44cb9e9cabbf097dae9cc0a16602b6d6a..9f9684f3961ef2d26cc289c17755c42f64f4a5be 100644 --- a/examples/video/qmlvideofx/qml/qmlvideofx/ContentVideo.qml +++ b/examples/video/qmlvideofx/qml/qmlvideofx/ContentVideo.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtMultimedia 4.0 +import QtMultimedia 5.0 VideoOutput { source: mediaPlayer diff --git a/src/imports/multimedia/Video.qml b/src/imports/multimedia/Video.qml index 3c96bcd7e451748ab60aafb05ff0347b510baed1..4fafc0ea4408b98bc6fd266dace4c0d63d448a4d 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 6766f5871df4e1a39cc5692a8b2f0eeb1d197179..9e6e0c177a12851f981245e56f977f39f3b8c54f 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 79709ba186f5aa1c6400f810d0e2b225e3e976a7..8153db0ac4f3768ba9a85a8dbac7b06b7866eb83 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 71b3b0697f7ca964e986c8425533b1331e3c407c..96251a1edb1b505550ccb7c37b34b808dc9b9d0a 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 79d939e83e5c12a25e1204e7632de2b3e75b0401..e9f04de2c1f4d3ad0cb6ef92d81569aa8941dc2f 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 08cbc81ef9d30fc84bdb188b48f9242478a5bc34..b630bdaead6afe3af61c2f438252df4d1fec7bf9 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 4a74165ffbd05125f54e01210a5510684f633085..d0ff64474f6e3be9ccd5549f49c07d3d64b2b1c0 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 956d1d79642fee450cb761e97c500f86725e8ba0..1e57ad7885803cbab623d7dfb92b2a2ae6c4e79f 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 6e2e8c88d8c6c2ffbc15a88436915450930cddfd..51e74998ff3099c055810fc1e836ed6c355f54de 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 8eff6b7ff92a2012e3a3ec64534093f525fc3e07..369d6a6514e94bf0221ea62ab02e898c2bcfe296 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 b1c359ef0773af8440fe3498ccde3b58d63e1e1a..ee1b99ce8a147b9e882b5ff630c9b604c488e126 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.