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>
2012-01-11 12:12:55 +10:00
parent 99b80809c7
commit 3d88a055d0
30 changed files with 79 additions and 54 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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;
--- 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
--- 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
--- 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
--- 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
--- 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