summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYoann Lopes <yoann.lopes@qt.io>2016-09-07 15:37:03 +0200
committerYoann Lopes <yoann.lopes@qt.io>2016-09-15 13:26:35 +0000
commit6e8f05f016726e078374f92092f643b5154855cf (patch)
tree5ef9f2006acb61dc49af373a6b4e9fb8b5c130d9
parentaf985a697a47cc887625e06c05f5cb785ee66d35 (diff)
Update plugins.qmltypes for 5.8
Change-Id: Iade5ceb5f791abaa2ec7649ff4752d1b59d96aad Reviewed-by: Christian Stromme <christian.stromme@qt.io>
-rw-r--r--src/imports/multimedia/plugins.qmltypes23
1 files changed, 20 insertions, 3 deletions
diff --git a/src/imports/multimedia/plugins.qmltypes b/src/imports/multimedia/plugins.qmltypes
index 91fff02eb..20bbf7d3e 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.7'
+// 'qmlplugindump -nonrelocatable QtMultimedia 5.8'
Module {
dependencies: ["QtQuick 2.0"]
@@ -1248,8 +1248,24 @@ Module {
isCreatable: false
isSingleton: true
exportMetaObjectRevisions: [0]
+ Enum {
+ name: "VolumeScale"
+ values: {
+ "LinearVolumeScale": 0,
+ "CubicVolumeScale": 1,
+ "LogarithmicVolumeScale": 2,
+ "DecibelVolumeScale": 3
+ }
+ }
Property { name: "defaultCamera"; type: "QJSValue"; isReadonly: true }
Property { name: "availableCameras"; type: "QJSValue"; isReadonly: true }
+ Method {
+ name: "convertVolume"
+ type: "double"
+ Parameter { name: "volume"; type: "double" }
+ Parameter { name: "from"; type: "VolumeScale" }
+ Parameter { name: "to"; type: "VolumeScale" }
+ }
}
Component {
name: "QDeclarativePlaylist"
@@ -1794,9 +1810,10 @@ Module {
prototype: "QObject"
exports: [
"QtMultimedia/SoundEffect 5.0",
- "QtMultimedia/SoundEffect 5.3"
+ "QtMultimedia/SoundEffect 5.3",
+ "QtMultimedia/SoundEffect 5.8"
]
- exportMetaObjectRevisions: [0, 0]
+ exportMetaObjectRevisions: [0, 0, 0]
Enum {
name: "Loop"
values: {