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

Update version number in QML plugins.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
src/imports/audioengine/audioengine.pro
View File

@@ -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

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

@@ -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"

12
src/imports/audioengine/qdeclarative_attenuationmodel_p.cpp
View File

@@ -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

5
src/imports/audioengine/qdeclarative_audiocategory_p.cpp
View File

@@ -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

5
src/imports/audioengine/qdeclarative_audioengine_p.cpp
View File

@@ -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

8
src/imports/audioengine/qdeclarative_audiolistener_p.cpp
View File

@@ -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

5
src/imports/audioengine/qdeclarative_audiosample_p.cpp
View File

@@ -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

5
src/imports/audioengine/qdeclarative_playvariation_p.cpp
View File

@@ -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

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

@@ -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"

8
src/imports/audioengine/qdeclarative_soundinstance_p.cpp
View File

@@ -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"

4
src/multimedia/doc/src/multimedia.qdoc
View File

@@ -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

4
src/multimedia/doc/src/qtaudioengine.qdoc
View File

@@ -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

2
src/multimedia/doc/src/qtmultimedia-index.qdoc
View File

@@ -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++

4
src/multimedia/doc/src/qtmultimedia5.qdoc
View File

@@ -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