diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-02 13:48:43 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-02 13:48:43 +0200 |
| commit | 87e5e24f52f0702620cd6ff656db540f01a28cc5 (patch) | |
| tree | 7f83b2423b1a06b21085a76da3347088ca30e8cf /src/imports/multimedia/plugins.qmltypes | |
| parent | c5ebfb0c19deff34eea5099ba59750b746257d71 (diff) | |
| parent | 46a83d5b86a792e62f14674e27c5d95695f2b44d (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: I1373622a6d1fd0e2d35df2da79860a373056387f
Diffstat (limited to 'src/imports/multimedia/plugins.qmltypes')
| -rw-r--r-- | src/imports/multimedia/plugins.qmltypes | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/imports/multimedia/plugins.qmltypes b/src/imports/multimedia/plugins.qmltypes index 4d529dece..fe1c68af2 100644 --- a/src/imports/multimedia/plugins.qmltypes +++ b/src/imports/multimedia/plugins.qmltypes @@ -270,8 +270,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: { @@ -543,7 +547,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" } } @@ -1654,8 +1658,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: { |