summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYoann Lopes <yoann.lopes@theqtcompany.com>2016-02-24 14:25:33 +0100
committerJani Heikkinen <jani.heikkinen@theqtcompany.com>2016-02-25 16:27:43 +0000
commit9985224a89b830dc182b428f491b6187d6f0e1ba (patch)
tree98326763643aa9cd2b8eb862102f3be4421720d7
parent857996876e769bbdd1ab5058b8c3c9c9f3406190 (diff)
Update version number in QML plugins.v5.6.0
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>
-rw-r--r--src/imports/audioengine/audioengine.pro2
-rw-r--r--src/imports/audioengine/plugins.qmltypes4
-rw-r--r--src/imports/audioengine/qdeclarative_attenuationmodel_p.cpp12
-rw-r--r--src/imports/audioengine/qdeclarative_audiocategory_p.cpp5
-rw-r--r--src/imports/audioengine/qdeclarative_audioengine_p.cpp5
-rw-r--r--src/imports/audioengine/qdeclarative_audiolistener_p.cpp8
-rw-r--r--src/imports/audioengine/qdeclarative_audiosample_p.cpp5
-rw-r--r--src/imports/audioengine/qdeclarative_playvariation_p.cpp5
-rw-r--r--src/imports/audioengine/qdeclarative_sound_p.cpp4
-rw-r--r--src/imports/audioengine/qdeclarative_soundinstance_p.cpp8
-rw-r--r--src/multimedia/doc/src/multimedia.qdoc4
-rw-r--r--src/multimedia/doc/src/qtaudioengine.qdoc4
-rw-r--r--src/multimedia/doc/src/qtmultimedia-index.qdoc2
-rw-r--r--src/multimedia/doc/src/qtmultimedia5.qdoc4
14 files changed, 10 insertions, 62 deletions
diff --git a/src/imports/audioengine/audioengine.pro b/src/imports/audioengine/audioengine.pro
index 6c4b17c1..c00a6ec6 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.0
+IMPORT_VERSION = 1.1
QT += quick qml multimedia-private
diff --git a/src/imports/audioengine/plugins.qmltypes b/src/imports/audioengine/plugins.qmltypes
index 22fad073..0468d839 100644
--- a/src/imports/audioengine/plugins.qmltypes
+++ b/src/imports/audioengine/plugins.qmltypes
@@ -4,10 +4,10 @@ import QtQuick.tooling 1.2
// It is used for QML tooling purposes only.
//
// This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtAudioEngine 1.0'
+// 'qmlplugindump -nonrelocatable QtAudioEngine 1.1'
Module {
- dependencies: []
+ dependencies: ["QtQuick 2.0"]
Component {
name: "QDeclarativeAttenuationModel"
prototype: "QObject"
diff --git a/src/imports/audioengine/qdeclarative_attenuationmodel_p.cpp b/src/imports/audioengine/qdeclarative_attenuationmodel_p.cpp
index 7ecdb41a..c15c7776 100644
--- a/src/imports/audioengine/qdeclarative_attenuationmodel_p.cpp
+++ b/src/imports/audioengine/qdeclarative_attenuationmodel_p.cpp
@@ -79,17 +79,11 @@ void QDeclarativeAttenuationModel::setName(const QString& name)
\inherits Item
\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
\l{QtAudioEngine::AudioEngine::addAttenuationModel()}{AudioEngine.addAttenuationModel()}
if AttenuationModelLinear is created dynamically.
\qml
- import QtQuick 2.0
- import QtAudioEngine 1.0
-
-
Rectangle {
color:"white"
width: 300
@@ -214,17 +208,11 @@ qreal QDeclarativeAttenuationModelLinear::calculateGain(const QVector3D &listene
\inherits Item
\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
\l{QtAudioEngine::AudioEngine::addAttenuationModel()}{AudioEngine.addAttenuationModel()}
if AttenuationModelInverse is created dynamically.
\qml
- import QtQuick 2.0
- import QtAudioEngine 1.0
-
-
Rectangle {
color:"white"
width: 300
diff --git a/src/imports/audioengine/qdeclarative_audiocategory_p.cpp b/src/imports/audioengine/qdeclarative_audiocategory_p.cpp
index 847941ca..4931cce7 100644
--- a/src/imports/audioengine/qdeclarative_audiocategory_p.cpp
+++ b/src/imports/audioengine/qdeclarative_audiocategory_p.cpp
@@ -48,17 +48,12 @@ QT_USE_NAMESPACE
\inherits Item
\preliminary
- This type is part of the \b{QtAudioEngine 1.0} module.
-
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
to it using \l{QtAudioEngine::AudioEngine::addAudioCategory()}{AudioEngine.addAudioCategory()} if
AudioCategory is created dynamically.
\qml
- import QtQuick 2.0
- import QtAudioEngine 1.0
-
Rectangle {
color:"white"
width: 300
diff --git a/src/imports/audioengine/qdeclarative_audioengine_p.cpp b/src/imports/audioengine/qdeclarative_audioengine_p.cpp
index dd80c698..bb53cbb3 100644
--- a/src/imports/audioengine/qdeclarative_audioengine_p.cpp
+++ b/src/imports/audioengine/qdeclarative_audioengine_p.cpp
@@ -57,12 +57,7 @@ QT_BEGIN_NAMESPACE
\inherits Item
\preliminary
- \c AudioEngine is part of the \b{QtAudioEngine 1.0} module.
-
\qml
- import QtQuick 2.0
- import QtAudioEngine 1.0
-
Rectangle {
color:"white"
width: 300
diff --git a/src/imports/audioengine/qdeclarative_audiolistener_p.cpp b/src/imports/audioengine/qdeclarative_audiolistener_p.cpp
index 0403fc1c..645a0446 100644
--- a/src/imports/audioengine/qdeclarative_audiolistener_p.cpp
+++ b/src/imports/audioengine/qdeclarative_audiolistener_p.cpp
@@ -49,15 +49,10 @@ QT_USE_NAMESPACE
\inherits Item
\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
listener property of AudioEngine:
\qml
- import QtQuick 2.0
- import QtAudioEngine 1.0
-
Rectangle {
color:"white"
width: 300
@@ -92,9 +87,6 @@ QT_USE_NAMESPACE
or alternatively, by defining an AudioListener outside AudioEngine:
\qml
- import QtQuick 2.0
- import QtAudioEngine 1.0
-
Rectangle {
color:"white"
width: 300
diff --git a/src/imports/audioengine/qdeclarative_audiosample_p.cpp b/src/imports/audioengine/qdeclarative_audiosample_p.cpp
index 297af3b3..09f70870 100644
--- a/src/imports/audioengine/qdeclarative_audiosample_p.cpp
+++ b/src/imports/audioengine/qdeclarative_audiosample_p.cpp
@@ -51,17 +51,12 @@ QT_USE_NAMESPACE
\inherits Item
\preliminary
- \c AudioSample is part of the \b{QtAudioEngine 1.0} module.
-
It can be accessed through QtAudioEngine::AudioEngine::samples with its unique
name and must be defined inside AudioEngine or be added to it using
\l{QtAudioEngine::AudioEngine::addAudioSample()}{AudioEngine.addAudioSample()}
if AudioSample is created dynamically.
\qml
- import QtQuick 2.0
- import QtAudioEngine 1.0
-
Rectangle {
color:"white"
width: 300
diff --git a/src/imports/audioengine/qdeclarative_playvariation_p.cpp b/src/imports/audioengine/qdeclarative_playvariation_p.cpp
index 156f83f6..ac2bd67a 100644
--- a/src/imports/audioengine/qdeclarative_playvariation_p.cpp
+++ b/src/imports/audioengine/qdeclarative_playvariation_p.cpp
@@ -53,16 +53,11 @@ QT_USE_NAMESPACE
\inherits Item
\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
\l{QtAudioEngine::Sound::addPlayVariation()}{Sound.addPlayVariation()}
if PlayVariation is created dynamically.
\qml
- import QtQuick 2.0
- import QtAudioEngine 1.0
-
Rectangle {
color:"white"
width: 300
diff --git a/src/imports/audioengine/qdeclarative_sound_p.cpp b/src/imports/audioengine/qdeclarative_sound_p.cpp
index f19b8dbb..497b8349 100644
--- a/src/imports/audioengine/qdeclarative_sound_p.cpp
+++ b/src/imports/audioengine/qdeclarative_sound_p.cpp
@@ -159,16 +159,12 @@ void QDeclarativeSoundCone::setEngine(QDeclarativeAudioEngine *engine)
\inherits Item
\preliminary
- This type is part of the \b{QtAudioEngine 1.0} module.
-
Sound can be accessed through QtAudioEngine::AudioEngine::sounds with its unique name
and must be defined inside AudioEngine or be added to it using
\l{QtAudioEngine::AudioEngine::addSound()}{AudioEngine.addSound()}
if \l Sound is created dynamically.
\qml
- import QtQuick 2.0
- import QtAudioEngine 1.0
Rectangle {
color:"white"
diff --git a/src/imports/audioengine/qdeclarative_soundinstance_p.cpp b/src/imports/audioengine/qdeclarative_soundinstance_p.cpp
index bdb2e775..c2997247 100644
--- a/src/imports/audioengine/qdeclarative_soundinstance_p.cpp
+++ b/src/imports/audioengine/qdeclarative_soundinstance_p.cpp
@@ -52,15 +52,10 @@ QT_USE_NAMESPACE
\inherits Item
\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
method of a \l Sound:
\qml
- import QtQuick 2.0
- import QtAudioEngine 1.0
-
Rectangle {
id:root
color:"white"
@@ -98,9 +93,6 @@ QT_USE_NAMESPACE
easier qml bindings:
\qml
- import QtQuick 2.0
- import QtAudioEngine 1.0
-
Rectangle {
id:root
color:"white"
diff --git a/src/multimedia/doc/src/multimedia.qdoc b/src/multimedia/doc/src/multimedia.qdoc
index 5849af59..813847d8 100644
--- a/src/multimedia/doc/src/multimedia.qdoc
+++ b/src/multimedia/doc/src/multimedia.qdoc
@@ -177,12 +177,12 @@ what changed, and what you might need to change when porting code.
\section2 QML Types
The QML types are accessed by using:
\code
-import QtMultimedia 5.5
+import QtMultimedia 5.6
\endcode
\annotatedlist multimedia_qml
The following types are accessed by using \l{Qt Audio Engine QML Types}{Qt Audio Engine}:
\code
-import QtAudioEngine 1.0
+import QtAudioEngine 1.1
\endcode
\annotatedlist multimedia_audioengine
diff --git a/src/multimedia/doc/src/qtaudioengine.qdoc b/src/multimedia/doc/src/qtaudioengine.qdoc
index 3b65379d..2de2bb25 100644
--- a/src/multimedia/doc/src/qtaudioengine.qdoc
+++ b/src/multimedia/doc/src/qtaudioengine.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
-\qmlmodule QtAudioEngine 1.0
+\qmlmodule QtAudioEngine 1.1
\title Qt Audio Engine QML Types
\ingroup qmlmodules
\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
statement in your .qml file:
\code
-import QtAudioEngine 1.0
+import QtAudioEngine 1.1
\endcode
\section1 Qt Audio Engine Features
diff --git a/src/multimedia/doc/src/qtmultimedia-index.qdoc b/src/multimedia/doc/src/qtmultimedia-index.qdoc
index e51ec97e..989b8886 100644
--- a/src/multimedia/doc/src/qtmultimedia-index.qdoc
+++ b/src/multimedia/doc/src/qtmultimedia-index.qdoc
@@ -54,7 +54,7 @@
import statement in your \c {.qml} file.
\code
- import QtMultimedia 5.5
+ import QtMultimedia 5.6
\endcode
If you intend to use the C++ classes in your application, include the C++
diff --git a/src/multimedia/doc/src/qtmultimedia5.qdoc b/src/multimedia/doc/src/qtmultimedia5.qdoc
index 0d3e087a..21854ae7 100644
--- a/src/multimedia/doc/src/qtmultimedia5.qdoc
+++ b/src/multimedia/doc/src/qtmultimedia5.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
-\qmlmodule QtMultimedia 5.5
+\qmlmodule QtMultimedia 5.6
\title Qt Multimedia QML Types
\ingroup qmlmodules
\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
statement in your .qml file:
\code
-import QtMultimedia 5.5
+import QtMultimedia 5.6
\endcode
\section1 QML types