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>

1 files changed, 24 insertions, 0 deletions

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>();
     }