diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/audioengine/audioengine.cpp | 2 | ||||
-rw-r--r-- | src/imports/audioengine/audioengine.pro | 2 | ||||
-rw-r--r-- | src/imports/audioengine/qdeclarative_audioengine_p.cpp | 4 | ||||
-rw-r--r-- | src/multimedia/doc/src/multimedia.qdoc | 6 | ||||
-rw-r--r-- | src/multimedia/doc/src/qtaudioengine.qdoc | 8 |
5 files changed, 12 insertions, 10 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 diff --git a/src/multimedia/doc/src/multimedia.qdoc b/src/multimedia/doc/src/multimedia.qdoc index 68e8ba31c..ad8273612 100644 --- a/src/multimedia/doc/src/multimedia.qdoc +++ b/src/multimedia/doc/src/multimedia.qdoc @@ -181,9 +181,9 @@ import QtMultimedia 5.8 \endcode \annotatedlist multimedia_qml The following types are accessed by using \l{Qt Audio Engine QML Types}{Qt Audio Engine}: -\code -import QtAudioEngine 1.1 -\endcode +\qml \QtMinorVersion +import QtAudioEngine 1.\1 +\endqml \annotatedlist multimedia_audioengine \section2 Multimedia Classes diff --git a/src/multimedia/doc/src/qtaudioengine.qdoc b/src/multimedia/doc/src/qtaudioengine.qdoc index bb12489de..bf8be899e 100644 --- a/src/multimedia/doc/src/qtaudioengine.qdoc +++ b/src/multimedia/doc/src/qtaudioengine.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! -\qmlmodule QtAudioEngine 1.1 +\qmlmodule QtAudioEngine 1.\QtMinorVersion \title Qt Audio Engine QML Types \ingroup qmlmodules \brief Provides QML types for 3D positional audio playback and content management. @@ -36,9 +36,9 @@ Engine provides types for 3D positional audio playback and content management. The QML types can be imported into your application using the following import statement in your .qml file: -\code -import QtAudioEngine 1.1 -\endcode +\qml \QtMinorVersion +import QtAudioEngine 1.\1 +\endqml \section1 Qt Audio Engine Features |