Update version number in QML plugins.

Also removes unnecessary references of that import version in
the documentation and snippets. The import version is always
displayed at the top of every doc page anyway.

Change-Id: Ifbf4666e0bc333c51f51104a5720b988e8c04d0b
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
This commit is contained in:
Yoann Lopes
2016-02-24 14:25:33 +01:00
committed by Jani Heikkinen
parent 857996876e
commit 9985224a89
14 changed files with 10 additions and 62 deletions

View File

@@ -1,7 +1,7 @@
CXX_MODULE = multimedia CXX_MODULE = multimedia
TARGET = declarative_audioengine TARGET = declarative_audioengine
TARGETPATH = QtAudioEngine TARGETPATH = QtAudioEngine
IMPORT_VERSION = 1.0 IMPORT_VERSION = 1.1
QT += quick qml multimedia-private QT += quick qml multimedia-private

View File

@@ -4,10 +4,10 @@ import QtQuick.tooling 1.2
// It is used for QML tooling purposes only. // It is used for QML tooling purposes only.
// //
// This file was auto-generated by: // This file was auto-generated by:
// 'qmlplugindump -nonrelocatable QtAudioEngine 1.0' // 'qmlplugindump -nonrelocatable QtAudioEngine 1.1'
Module { Module {
dependencies: [] dependencies: ["QtQuick 2.0"]
Component { Component {
name: "QDeclarativeAttenuationModel" name: "QDeclarativeAttenuationModel"
prototype: "QObject" prototype: "QObject"

View File

@@ -79,17 +79,11 @@ void QDeclarativeAttenuationModel::setName(const QString& name)
\inherits Item \inherits Item
\preliminary \preliminary
This type is part of the \b{QtAudioEngine 1.0} module.
AttenuationModelLinear must be defined inside \l AudioEngine or be added to it using AttenuationModelLinear must be defined inside \l AudioEngine or be added to it using
\l{QtAudioEngine::AudioEngine::addAttenuationModel()}{AudioEngine.addAttenuationModel()} \l{QtAudioEngine::AudioEngine::addAttenuationModel()}{AudioEngine.addAttenuationModel()}
if AttenuationModelLinear is created dynamically. if AttenuationModelLinear is created dynamically.
\qml \qml
import QtQuick 2.0
import QtAudioEngine 1.0
Rectangle { Rectangle {
color:"white" color:"white"
width: 300 width: 300
@@ -214,17 +208,11 @@ qreal QDeclarativeAttenuationModelLinear::calculateGain(const QVector3D &listene
\inherits Item \inherits Item
\preliminary \preliminary
This type is part of the \b{QtAudioEngine 1.0} module.
AttenuationModelInverse must be defined inside \l AudioEngine or be added to it using AttenuationModelInverse must be defined inside \l AudioEngine or be added to it using
\l{QtAudioEngine::AudioEngine::addAttenuationModel()}{AudioEngine.addAttenuationModel()} \l{QtAudioEngine::AudioEngine::addAttenuationModel()}{AudioEngine.addAttenuationModel()}
if AttenuationModelInverse is created dynamically. if AttenuationModelInverse is created dynamically.
\qml \qml
import QtQuick 2.0
import QtAudioEngine 1.0
Rectangle { Rectangle {
color:"white" color:"white"
width: 300 width: 300

View File

@@ -48,17 +48,12 @@ QT_USE_NAMESPACE
\inherits Item \inherits Item
\preliminary \preliminary
This type is part of the \b{QtAudioEngine 1.0} module.
An instance of AudioCategory can be accessed through \l {QtAudioEngine::AudioEngine::categories} An instance of AudioCategory can be accessed through \l {QtAudioEngine::AudioEngine::categories}
{AudioEngine.categories} with its unique name and must be defined inside AudioEngine or be added {AudioEngine.categories} with its unique name and must be defined inside AudioEngine or be added
to it using \l{QtAudioEngine::AudioEngine::addAudioCategory()}{AudioEngine.addAudioCategory()} if to it using \l{QtAudioEngine::AudioEngine::addAudioCategory()}{AudioEngine.addAudioCategory()} if
AudioCategory is created dynamically. AudioCategory is created dynamically.
\qml \qml
import QtQuick 2.0
import QtAudioEngine 1.0
Rectangle { Rectangle {
color:"white" color:"white"
width: 300 width: 300

View File

@@ -57,12 +57,7 @@ QT_BEGIN_NAMESPACE
\inherits Item \inherits Item
\preliminary \preliminary
\c AudioEngine is part of the \b{QtAudioEngine 1.0} module.
\qml \qml
import QtQuick 2.0
import QtAudioEngine 1.0
Rectangle { Rectangle {
color:"white" color:"white"
width: 300 width: 300

View File

@@ -49,15 +49,10 @@ QT_USE_NAMESPACE
\inherits Item \inherits Item
\preliminary \preliminary
This type is part of the \b{QtAudioEngine 1.0} module.
AudioListener will have only one global instance and you can either access it through the AudioListener will have only one global instance and you can either access it through the
listener property of AudioEngine: listener property of AudioEngine:
\qml \qml
import QtQuick 2.0
import QtAudioEngine 1.0
Rectangle { Rectangle {
color:"white" color:"white"
width: 300 width: 300
@@ -92,9 +87,6 @@ QT_USE_NAMESPACE
or alternatively, by defining an AudioListener outside AudioEngine: or alternatively, by defining an AudioListener outside AudioEngine:
\qml \qml
import QtQuick 2.0
import QtAudioEngine 1.0
Rectangle { Rectangle {
color:"white" color:"white"
width: 300 width: 300

View File

@@ -51,17 +51,12 @@ QT_USE_NAMESPACE
\inherits Item \inherits Item
\preliminary \preliminary
\c AudioSample is part of the \b{QtAudioEngine 1.0} module.
It can be accessed through QtAudioEngine::AudioEngine::samples with its unique It can be accessed through QtAudioEngine::AudioEngine::samples with its unique
name and must be defined inside AudioEngine or be added to it using name and must be defined inside AudioEngine or be added to it using
\l{QtAudioEngine::AudioEngine::addAudioSample()}{AudioEngine.addAudioSample()} \l{QtAudioEngine::AudioEngine::addAudioSample()}{AudioEngine.addAudioSample()}
if AudioSample is created dynamically. if AudioSample is created dynamically.
\qml \qml
import QtQuick 2.0
import QtAudioEngine 1.0
Rectangle { Rectangle {
color:"white" color:"white"
width: 300 width: 300

View File

@@ -53,16 +53,11 @@ QT_USE_NAMESPACE
\inherits Item \inherits Item
\preliminary \preliminary
This type is part of the \b{QtAudioEngine 1.0} module.
PlayVariation must be defined inside a \l Sound or be added to it using PlayVariation must be defined inside a \l Sound or be added to it using
\l{QtAudioEngine::Sound::addPlayVariation()}{Sound.addPlayVariation()} \l{QtAudioEngine::Sound::addPlayVariation()}{Sound.addPlayVariation()}
if PlayVariation is created dynamically. if PlayVariation is created dynamically.
\qml \qml
import QtQuick 2.0
import QtAudioEngine 1.0
Rectangle { Rectangle {
color:"white" color:"white"
width: 300 width: 300

View File

@@ -159,16 +159,12 @@ void QDeclarativeSoundCone::setEngine(QDeclarativeAudioEngine *engine)
\inherits Item \inherits Item
\preliminary \preliminary
This type is part of the \b{QtAudioEngine 1.0} module.
Sound can be accessed through QtAudioEngine::AudioEngine::sounds with its unique name Sound can be accessed through QtAudioEngine::AudioEngine::sounds with its unique name
and must be defined inside AudioEngine or be added to it using and must be defined inside AudioEngine or be added to it using
\l{QtAudioEngine::AudioEngine::addSound()}{AudioEngine.addSound()} \l{QtAudioEngine::AudioEngine::addSound()}{AudioEngine.addSound()}
if \l Sound is created dynamically. if \l Sound is created dynamically.
\qml \qml
import QtQuick 2.0
import QtAudioEngine 1.0
Rectangle { Rectangle {
color:"white" color:"white"

View File

@@ -52,15 +52,10 @@ QT_USE_NAMESPACE
\inherits Item \inherits Item
\preliminary \preliminary
This type is part of the \b{QtAudioEngine 1.0} module.
There are two ways to create SoundInstance objects. You can obtain it by calling newInstance There are two ways to create SoundInstance objects. You can obtain it by calling newInstance
method of a \l Sound: method of a \l Sound:
\qml \qml
import QtQuick 2.0
import QtAudioEngine 1.0
Rectangle { Rectangle {
id:root id:root
color:"white" color:"white"
@@ -98,9 +93,6 @@ QT_USE_NAMESPACE
easier qml bindings: easier qml bindings:
\qml \qml
import QtQuick 2.0
import QtAudioEngine 1.0
Rectangle { Rectangle {
id:root id:root
color:"white" color:"white"

View File

@@ -177,12 +177,12 @@ what changed, and what you might need to change when porting code.
\section2 QML Types \section2 QML Types
The QML types are accessed by using: The QML types are accessed by using:
\code \code
import QtMultimedia 5.5 import QtMultimedia 5.6
\endcode \endcode
\annotatedlist multimedia_qml \annotatedlist multimedia_qml
The following types are accessed by using \l{Qt Audio Engine QML Types}{Qt Audio Engine}: The following types are accessed by using \l{Qt Audio Engine QML Types}{Qt Audio Engine}:
\code \code
import QtAudioEngine 1.0 import QtAudioEngine 1.1
\endcode \endcode
\annotatedlist multimedia_audioengine \annotatedlist multimedia_audioengine

View File

@@ -26,7 +26,7 @@
****************************************************************************/ ****************************************************************************/
/*! /*!
\qmlmodule QtAudioEngine 1.0 \qmlmodule QtAudioEngine 1.1
\title Qt Audio Engine QML Types \title Qt Audio Engine QML Types
\ingroup qmlmodules \ingroup qmlmodules
\brief Provides QML types for 3D positional audio playback and content management. \brief Provides QML types for 3D positional audio playback and content management.
@@ -37,7 +37,7 @@ Engine provides types for 3D positional audio playback and content management.
The QML types can be imported into your application using the following import The QML types can be imported into your application using the following import
statement in your .qml file: statement in your .qml file:
\code \code
import QtAudioEngine 1.0 import QtAudioEngine 1.1
\endcode \endcode
\section1 Qt Audio Engine Features \section1 Qt Audio Engine Features

View File

@@ -54,7 +54,7 @@
import statement in your \c {.qml} file. import statement in your \c {.qml} file.
\code \code
import QtMultimedia 5.5 import QtMultimedia 5.6
\endcode \endcode
If you intend to use the C++ classes in your application, include the C++ If you intend to use the C++ classes in your application, include the C++

View File

@@ -26,7 +26,7 @@
****************************************************************************/ ****************************************************************************/
/*! /*!
\qmlmodule QtMultimedia 5.5 \qmlmodule QtMultimedia 5.6
\title Qt Multimedia QML Types \title Qt Multimedia QML Types
\ingroup qmlmodules \ingroup qmlmodules
\brief Provides QML types for multimedia support. \brief Provides QML types for multimedia support.
@@ -42,7 +42,7 @@ The QML types for \l{Qt Multimedia} support the basic use cases such as:
The QML types can be imported into your application using the following import The QML types can be imported into your application using the following import
statement in your .qml file: statement in your .qml file:
\code \code
import QtMultimedia 5.5 import QtMultimedia 5.6
\endcode \endcode
\section1 QML types \section1 QML types