diff options
Diffstat (limited to 'src/imports')
9 files changed, 12 insertions, 3 deletions
diff --git a/src/imports/audioengine/qdeclarative_attenuationmodel_p.cpp b/src/imports/audioengine/qdeclarative_attenuationmodel_p.cpp index 729558cd2..9d3c4fcb6 100644 --- a/src/imports/audioengine/qdeclarative_attenuationmodel_p.cpp +++ b/src/imports/audioengine/qdeclarative_attenuationmodel_p.cpp @@ -84,6 +84,7 @@ void QDeclarativeAttenuationModel::setName(const QString& name) \ingroup multimedia_audioengine \inherits Item \preliminary + \deprecated AttenuationModelLinear must be defined inside \l AudioEngine or be added to it using \l{QtAudioEngine::AudioEngine::addAttenuationModel()}{AudioEngine.addAttenuationModel()} @@ -213,6 +214,7 @@ qreal QDeclarativeAttenuationModelLinear::calculateGain(const QVector3D &listene \ingroup multimedia_audioengine \inherits Item \preliminary + \deprecated AttenuationModelInverse must be defined inside \l AudioEngine or be added to it using \l{QtAudioEngine::AudioEngine::addAttenuationModel()}{AudioEngine.addAttenuationModel()} diff --git a/src/imports/audioengine/qdeclarative_audiocategory_p.cpp b/src/imports/audioengine/qdeclarative_audiocategory_p.cpp index 84ba6b190..3561e3800 100644 --- a/src/imports/audioengine/qdeclarative_audiocategory_p.cpp +++ b/src/imports/audioengine/qdeclarative_audiocategory_p.cpp @@ -53,6 +53,7 @@ QT_USE_NAMESPACE \ingroup multimedia_audioengine \inherits Item \preliminary + \deprecated 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 diff --git a/src/imports/audioengine/qdeclarative_audioengine_p.cpp b/src/imports/audioengine/qdeclarative_audioengine_p.cpp index 24d878dd8..96046fa31 100644 --- a/src/imports/audioengine/qdeclarative_audioengine_p.cpp +++ b/src/imports/audioengine/qdeclarative_audioengine_p.cpp @@ -62,6 +62,7 @@ QT_BEGIN_NAMESPACE \ingroup multimedia_audioengine \inherits Item \preliminary + \deprecated \qml Rectangle { diff --git a/src/imports/audioengine/qdeclarative_audiolistener_p.cpp b/src/imports/audioengine/qdeclarative_audiolistener_p.cpp index 39a30171b..4ed305a72 100644 --- a/src/imports/audioengine/qdeclarative_audiolistener_p.cpp +++ b/src/imports/audioengine/qdeclarative_audiolistener_p.cpp @@ -54,6 +54,7 @@ QT_USE_NAMESPACE \ingroup multimedia_audioengine \inherits Item \preliminary + \deprecated AudioListener will have only one global instance and you can either access it through the listener property of AudioEngine: diff --git a/src/imports/audioengine/qdeclarative_audiosample_p.cpp b/src/imports/audioengine/qdeclarative_audiosample_p.cpp index 4eccf5052..2e521edd9 100644 --- a/src/imports/audioengine/qdeclarative_audiosample_p.cpp +++ b/src/imports/audioengine/qdeclarative_audiosample_p.cpp @@ -56,6 +56,7 @@ QT_USE_NAMESPACE \ingroup multimedia_audioengine \inherits Item \preliminary + \deprecated It can be accessed through QtAudioEngine::AudioEngine::samples with its unique name and must be defined inside AudioEngine or be added to it using diff --git a/src/imports/audioengine/qdeclarative_playvariation_p.cpp b/src/imports/audioengine/qdeclarative_playvariation_p.cpp index e6d3697d0..f0471d145 100644 --- a/src/imports/audioengine/qdeclarative_playvariation_p.cpp +++ b/src/imports/audioengine/qdeclarative_playvariation_p.cpp @@ -59,6 +59,7 @@ QT_USE_NAMESPACE \ingroup multimedia_audioengine \inherits Item \preliminary + \deprecated PlayVariation must be defined inside a \l Sound or be added to it using \l{QtAudioEngine::Sound::addPlayVariation()}{Sound.addPlayVariation()} diff --git a/src/imports/audioengine/qdeclarative_sound_p.cpp b/src/imports/audioengine/qdeclarative_sound_p.cpp index 347198f61..f07468eec 100644 --- a/src/imports/audioengine/qdeclarative_sound_p.cpp +++ b/src/imports/audioengine/qdeclarative_sound_p.cpp @@ -166,6 +166,7 @@ void QDeclarativeSoundCone::setEngine(QDeclarativeAudioEngine *engine) \ingroup multimedia_audioengine \inherits Item \preliminary + \deprecated Sound can be accessed through QtAudioEngine::AudioEngine::sounds with its unique name and must be defined inside AudioEngine or be added to it using diff --git a/src/imports/audioengine/qdeclarative_soundinstance_p.cpp b/src/imports/audioengine/qdeclarative_soundinstance_p.cpp index ad7480031..1bdb82343 100644 --- a/src/imports/audioengine/qdeclarative_soundinstance_p.cpp +++ b/src/imports/audioengine/qdeclarative_soundinstance_p.cpp @@ -57,6 +57,7 @@ QT_USE_NAMESPACE \ingroup multimedia_audioengine \inherits Item \preliminary + \deprecated There are two ways to create SoundInstance objects. You can obtain it by calling newInstance method of a \l Sound: diff --git a/src/imports/multimedia/qdeclarativeplaylist.cpp b/src/imports/multimedia/qdeclarativeplaylist.cpp index b768f99e3..400e23467 100644 --- a/src/imports/multimedia/qdeclarativeplaylist.cpp +++ b/src/imports/multimedia/qdeclarativeplaylist.cpp @@ -232,7 +232,7 @@ void QDeclarativePlaylist::setPlaybackMode(PlaybackMode mode) */ QUrl QDeclarativePlaylist::currentItemSource() const { - return m_playlist->currentMedia().canonicalUrl(); + return m_playlist->currentMedia().request().url(); } /*! @@ -316,7 +316,7 @@ QString QDeclarativePlaylist::errorString() const */ QUrl QDeclarativePlaylist::itemSource(int index) { - return m_playlist->media(index).canonicalUrl(); + return m_playlist->media(index).request().url(); } /*! @@ -548,7 +548,7 @@ QVariant QDeclarativePlaylist::data(const QModelIndex &index, int role) const if (!index.isValid()) return QVariant(); - return m_playlist->media(index.row()).canonicalUrl(); + return m_playlist->media(index.row()).request().url(); } QHash<int, QByteArray> QDeclarativePlaylist::roleNames() const |