diff options
| author | Marco Benelli <marco.benelli@theqtcompany.com> | 2015-09-15 13:37:57 +0200 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-09-15 13:02:34 +0000 |
| commit | 99f6cf5f282c0d3d7192d5e87b745873e159c93d (patch) | |
| tree | 1dab09e8444a3e561327b68ae47e262ade364a59 /src/imports/multimedia/plugins.qmltypes | |
| parent | 9c5292927e9f9668671f8e83ecdcc271515b9bf4 (diff) | |
Fixed revisions of camera-related meta objects.
Change-Id: I91fe90122d53ce12322cecac8282ef9622869b71
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
Diffstat (limited to 'src/imports/multimedia/plugins.qmltypes')
| -rw-r--r-- | src/imports/multimedia/plugins.qmltypes | 20 |
1 files changed, 14 insertions, 6 deletions
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: { |