slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix QML revisions registration for 5.6.

Browse Source 
And update plugins.qmltypes file.

Change-Id: I9b3cbeda4c8a0ce88a88f5a16fae6834dc8363d7
Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com>
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
This commit is contained in:
Yoann Lopes
2015-09-15 15:22:07 +02:00
parent da6d287e46
commit 0b192ce23e
4 changed files with 180 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/imports/audioengine/audioengine.cpp
View File

@@ -70,8 +70,8 @@ public:
qmlRegisterType<QDeclarativeAttenuationModelInverse>(uri, 1, 0, "AttenuationModelInverse");
// Dynamically adding audio engine related objects is only supported through revision 1
qmlRegisterRevision<QDeclarativeAudioEngine, 1>(uri, 1, 1);
qmlRegisterRevision<QDeclarativeSound, 1>(uri, 1, 1);
qmlRegisterType<QDeclarativeAudioEngine, 1>(uri, 1, 1, "AudioEngine");
qmlRegisterType<QDeclarativeSound, 1>(uri, 1, 1, "Sound");
}
};

42
src/imports/audioengine/plugins.qmltypes
View File

@@ -1,11 +1,13 @@
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.
//
// This file was auto-generated with the command 'qmlplugindump -notrelocatable QtAudioEngine 1.0'.
// This file was auto-generated by:
// 'qmlplugindump -nonrelocatable QtAudioEngine 1.0'
Module {
dependencies: []
Component {
name: "QDeclarativeAttenuationModel"
prototype: "QObject"
@@ -50,8 +52,11 @@ Module {
name: "QDeclarativeAudioEngine"
defaultProperty: "bank"
prototype: "QObject"
exports: ["QtAudioEngine/AudioEngine 1.0"]
exportMetaObjectRevisions: [0]
exports: [
"QtAudioEngine/AudioEngine 1.0",
"QtAudioEngine/AudioEngine 1.1"
]
exportMetaObjectRevisions: [0, 1]
Property { name: "bank"; type: "QObject"; isList: true; isReadonly: true }
Property { name: "categories"; type: "QObject"; isReadonly: true; isPointer: true }
Property { name: "samples"; type: "QObject"; isReadonly: true; isPointer: true }
@@ -70,6 +75,26 @@ Module {
Signal { name: "liveInstanceCountChanged" }
Signal { name: "isLoadingChanged" }
Signal { name: "finishedLoading" }
Method {
name: "addAudioSample"
revision: 1
Parameter { type: "QDeclarativeAudioSample"; isPointer: true }
}
Method {
name: "addSound"
revision: 1
Parameter { type: "QDeclarativeSound"; isPointer: true }
}
Method {
name: "addAudioCategory"
revision: 1
Parameter { type: "QDeclarativeAudioCategory"; isPointer: true }
}
Method {
name: "addAttenuationModel"
revision: 1
Parameter { type: "QDeclarativeAttenuationModel"; isPointer: true }
}
}
Component {
name: "QDeclarativeAudioListener"
@@ -111,8 +136,8 @@ Module {
name: "QDeclarativeSound"
defaultProperty: "playVariationlist"
prototype: "QObject"
exports: ["QtAudioEngine/Sound 1.0"]
exportMetaObjectRevisions: [0]
exports: ["QtAudioEngine/Sound 1.0", "QtAudioEngine/Sound 1.1"]
exportMetaObjectRevisions: [0, 1]
Enum {
name: "PlayType"
values: {
@@ -196,6 +221,11 @@ Module {
Parameter { name: "pitch"; type: "double" }
}
Method { name: "newInstance"; type: "QDeclarativeSoundInstance*" }
Method {
name: "addPlayVariation"
revision: 1
Parameter { type: "QDeclarativePlayVariation"; isPointer: true }
}
}
Component {
name: "QDeclarativeSoundCone"