summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Stromme <christian.stromme@qt.io>2017-10-20 00:16:22 +0200
committerChristian Stromme <christian.stromme@qt.io>2017-10-20 10:58:27 +0000
commit0e91c4b4fddc9757e8a92a60bdd2a59bc3f876f1 (patch)
tree910b537b4e3859845456ae41ab640c1d49281e89
parent9a9bcd7da53ff3b2468ac37b45bf3de88a590332 (diff)
downloadqtmultimedia-0e91c4b4fddc9757e8a92a60bdd2a59bc3f876f1.tar.gz
Update plugins.qmltypes for 5.9
Change-Id: I3969c6e91438b9e411b8e93a304c666c2c36bf21 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
-rw-r--r--src/imports/multimedia/plugins.qmltypes26
1 files changed, 19 insertions, 7 deletions
diff --git a/src/imports/multimedia/plugins.qmltypes b/src/imports/multimedia/plugins.qmltypes
index 20bbf7d3e..e4044fa70 100644
--- a/src/imports/multimedia/plugins.qmltypes
+++ b/src/imports/multimedia/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
// It is used for QML tooling purposes only.
//
// This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtMultimedia 5.8'
+// 'qmlplugindump -nonrelocatable QtMultimedia 5.9'
Module {
dependencies: ["QtQuick 2.0"]
@@ -149,10 +149,12 @@ Module {
exports: [
"QtMultimedia/Audio 5.0",
"QtMultimedia/Audio 5.6",
+ "QtMultimedia/Audio 5.9",
"QtMultimedia/MediaPlayer 5.0",
- "QtMultimedia/MediaPlayer 5.6"
+ "QtMultimedia/MediaPlayer 5.6",
+ "QtMultimedia/MediaPlayer 5.9"
]
- exportMetaObjectRevisions: [0, 1, 0, 1]
+ exportMetaObjectRevisions: [0, 1, 2, 0, 1, 2]
Enum {
name: "Status"
values: {
@@ -243,6 +245,7 @@ Module {
Property { name: "mediaObject"; type: "QObject"; isReadonly: true; isPointer: true }
Property { name: "availability"; type: "Availability"; isReadonly: true }
Property { name: "audioRole"; revision: 1; type: "AudioRole" }
+ Property { name: "notifyInterval"; revision: 2; type: "int" }
Signal { name: "playlistChanged"; revision: 1 }
Signal { name: "loopCountChanged" }
Signal { name: "paused" }
@@ -258,6 +261,7 @@ Module {
Parameter { name: "error"; type: "QDeclarativeAudio::Error" }
Parameter { name: "errorString"; type: "string" }
}
+ Signal { name: "notifyIntervalChanged"; revision: 2 }
Method { name: "play" }
Method { name: "pause" }
Method { name: "stop" }
@@ -554,13 +558,17 @@ Module {
Component {
name: "QDeclarativeCameraCapture"
prototype: "QObject"
- exports: ["QtMultimedia/CameraCapture 5.0"]
+ exports: [
+ "QtMultimedia/CameraCapture 5.0",
+ "QtMultimedia/CameraCapture 5.9"
+ ]
isCreatable: false
- exportMetaObjectRevisions: [0]
+ exportMetaObjectRevisions: [0, 1]
Property { name: "ready"; type: "bool"; isReadonly: true }
Property { name: "capturedImagePath"; type: "string"; isReadonly: true }
Property { name: "resolution"; type: "QSize" }
Property { name: "errorString"; type: "string"; isReadonly: true }
+ Property { name: "supportedResolutions"; revision: 1; type: "QVariantList"; isReadonly: true }
Signal {
name: "readyForCaptureChanged"
Parameter { type: "bool" }
@@ -729,9 +737,12 @@ Module {
Component {
name: "QDeclarativeCameraFlash"
prototype: "QObject"
- exports: ["QtMultimedia/CameraFlash 5.0"]
+ exports: [
+ "QtMultimedia/CameraFlash 5.0",
+ "QtMultimedia/CameraFlash 5.9"
+ ]
isCreatable: false
- exportMetaObjectRevisions: [0]
+ exportMetaObjectRevisions: [0, 1]
Enum {
name: "FlashMode"
values: {
@@ -749,6 +760,7 @@ Module {
}
Property { name: "ready"; type: "bool"; isReadonly: true }
Property { name: "mode"; type: "FlashMode" }
+ Property { name: "supportedModes"; revision: 1; type: "QVariantList"; isReadonly: true }
Signal {
name: "flashReady"
Parameter { name: "status"; type: "bool" }