summaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorVaL Doroshchuk <valentyn.doroshchuk@qt.io>2019-02-25 14:24:29 +0100
committerVaL Doroshchuk <valentyn.doroshchuk@qt.io>2019-02-26 12:23:36 +0000
commitd247ababe8f248dcfac4da63970e6bc2192bc0e4 (patch)
tree35322b853707d7b9b5cd16533b94a9a93c193891 /src/imports
parenteecd98d19211383ef197ecedc28ba57dee316944 (diff)
QML: Make QtAudioEngine import available under 1.QT_MINOR_VERSION
Made the QtAudioEngine import always available under the latest Qt minor version import QtAudioEngine 1.13 for 5.13 Task-number: QTBUG-74031 Change-Id: I14f602a5c59a6a6906aeeda8644e64dae36312e3 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/audioengine/audioengine.cpp2
-rw-r--r--src/imports/audioengine/audioengine.pro2
-rw-r--r--src/imports/audioengine/qdeclarative_audioengine_p.cpp4
3 files changed, 5 insertions, 3 deletions
diff --git a/src/imports/audioengine/audioengine.cpp b/src/imports/audioengine/audioengine.cpp
index 1d3379b91..537b09ab8 100644
--- a/src/imports/audioengine/audioengine.cpp
+++ b/src/imports/audioengine/audioengine.cpp
@@ -79,6 +79,8 @@ public:
// Dynamically adding audio engine related objects is only supported through revision 1
qmlRegisterType<QDeclarativeAudioEngine, 1>(uri, 1, 1, "AudioEngine");
qmlRegisterType<QDeclarativeSound, 1>(uri, 1, 1, "Sound");
+
+ qmlRegisterModule(uri, 1, QT_VERSION_MINOR);
}
};
diff --git a/src/imports/audioengine/audioengine.pro b/src/imports/audioengine/audioengine.pro
index 1d46dfa33..f8d314282 100644
--- a/src/imports/audioengine/audioengine.pro
+++ b/src/imports/audioengine/audioengine.pro
@@ -1,7 +1,7 @@
CXX_MODULE = multimedia
TARGET = declarative_audioengine
TARGETPATH = QtAudioEngine
-IMPORT_VERSION = 1.1
+IMPORT_VERSION = 1.$$QT_MINOR_VERSION
QT += quick qml multimedia-private
diff --git a/src/imports/audioengine/qdeclarative_audioengine_p.cpp b/src/imports/audioengine/qdeclarative_audioengine_p.cpp
index bd309457e..24d878dd8 100644
--- a/src/imports/audioengine/qdeclarative_audioengine_p.cpp
+++ b/src/imports/audioengine/qdeclarative_audioengine_p.cpp
@@ -267,8 +267,8 @@ void QDeclarativeAudioEngine::initSound(QDeclarativeSound *sound)
Adds the given \a sample to the engine.
This can be used when the AudioSample is created dynamically:
- \qml
- import QtAudioEngine 1.1
+ \qml \QtMinorVersion
+ import QtAudioEngine 1.\1
AudioEngine {
id: engine