From 99f6cf5f282c0d3d7192d5e87b745873e159c93d Mon Sep 17 00:00:00 2001
From: Marco Benelli <marco.benelli@theqtcompany.com>
Date: Tue, 15 Sep 2015 13:37:57 +0200
Subject: Fixed revisions of camera-related meta objects.

Change-Id: I91fe90122d53ce12322cecac8282ef9622869b71
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
---
 src/imports/multimedia/multimedia.cpp   |  6 +++---
 src/imports/multimedia/plugins.qmltypes | 20 ++++++++++++++------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp
index 652359f3b..4b31068ea 100644
--- a/src/imports/multimedia/multimedia.cpp
+++ b/src/imports/multimedia/multimedia.cpp
@@ -97,7 +97,7 @@ public:
                                 trUtf8("CameraImageProcessing is provided by Camera"));
 
         // 5.2 types
-        qmlRegisterRevision<QDeclarativeVideoOutput, 2>(uri, 5, 2);
+        qmlRegisterType<QDeclarativeVideoOutput, 2>(uri, 5, 2, "VideoOutput");
 
         // 5.3 types
         // Nothing changed, but adding "import QtMultimedia 5.3" in QML will fail unless at
@@ -106,13 +106,13 @@ public:
 
         // 5.4 types
         qmlRegisterSingletonType<QDeclarativeMultimediaGlobal>(uri, 5, 4, "QtMultimedia", multimedia_global_object);
-        qmlRegisterRevision<QDeclarativeCamera, 1>(uri, 5, 4);
+        qmlRegisterType<QDeclarativeCamera, 1>(uri, 5, 4, "Camera");
         qmlRegisterUncreatableType<QDeclarativeCameraViewfinder>(uri, 5, 4, "CameraViewfinder",
                                 trUtf8("CameraViewfinder is provided by Camera"));
 
         // 5.5 types
         qmlRegisterUncreatableType<QDeclarativeCameraImageProcessing, 1>(uri, 5, 5, "CameraImageProcessing", trUtf8("CameraImageProcessing is provided by Camera"));
-        qmlRegisterRevision<QDeclarativeCamera, 2>(uri, 5, 5);
+        qmlRegisterType<QDeclarativeCamera, 2>(uri, 5, 5, "Camera");
 
         qmlRegisterType<QDeclarativeMediaMetaData>();
         qmlRegisterType<QAbstractVideoFilter>();
diff --git a/src/imports/multimedia/plugins.qmltypes b/src/imports/multimedia/plugins.qmltypes
index d01c988ba..53d7cb435 100644
--- a/src/imports/multimedia/plugins.qmltypes
+++ b/src/imports/multimedia/plugins.qmltypes
@@ -1,4 +1,4 @@
-import QtQuick.tooling 1.1
+import QtQuick.tooling 1.2
 
 // This file describes the plugin-supplied types contained in the library.
 // It is used for QML tooling purposes only.
@@ -7,6 +7,7 @@ import QtQuick.tooling 1.1
 // 'qmlplugindump -nonrelocatable QtMultimedia 5.5'
 
 Module {
+    dependencies: ["QtQuick 2.0"]
     Component {
         name: "QAbstractVideoFilter"
         prototype: "QObject"
@@ -244,8 +245,12 @@ Module {
     Component {
         name: "QDeclarativeCamera"
         prototype: "QObject"
-        exports: ["QtMultimedia/Camera 5.0"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "QtMultimedia/Camera 5.0",
+            "QtMultimedia/Camera 5.4",
+            "QtMultimedia/Camera 5.5"
+        ]
+        exportMetaObjectRevisions: [0, 1, 2]
         Enum {
             name: "Position"
             values: {
@@ -517,7 +522,7 @@ Module {
             name: "supportedViewfinderFrameRateRanges"
             revision: 2
             type: "QJSValue"
-            Parameter { name: "resolution"; type: "QSize" }
+            Parameter { name: "resolution"; type: "QJSValue" }
         }
         Method { name: "supportedViewfinderFrameRateRanges"; revision: 2; type: "QJSValue" }
     }
@@ -1497,8 +1502,11 @@ Module {
         name: "QDeclarativeVideoOutput"
         defaultProperty: "data"
         prototype: "QQuickItem"
-        exports: ["QtMultimedia/VideoOutput 5.0"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "QtMultimedia/VideoOutput 5.0",
+            "QtMultimedia/VideoOutput 5.2"
+        ]
+        exportMetaObjectRevisions: [0, 2]
         Enum {
             name: "FillMode"
             values: {
-- 
cgit v1.2.3