diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-19 14:29:40 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-19 14:29:47 +0200 |
| commit | 01c9322bfe918b886468eb520d77b21b6d8c0c11 (patch) | |
| tree | 23362a67d26b7b295a04e8cbacd64ee20393f990 /src/imports | |
| parent | 0f47f44d2fc7b3fac7fdd8ee6eeafd767c43ec2e (diff) | |
| parent | 256ee311b936d69561e97f7f8ee832cff93cb509 (diff) | |
| download | qtmultimedia-01c9322bfe918b886468eb520d77b21b6d8c0c11.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I022c07dab3ded6072f7c103e299822caaf40cf34
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/multimedia/qdeclarativeplaylist.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/imports/multimedia/qdeclarativeplaylist.cpp b/src/imports/multimedia/qdeclarativeplaylist.cpp index 0620942bd..b338c33e5 100644 --- a/src/imports/multimedia/qdeclarativeplaylist.cpp +++ b/src/imports/multimedia/qdeclarativeplaylist.cpp @@ -597,7 +597,7 @@ void QDeclarativePlaylist::componentComplete() } /*! - \qmlsignal QtMultimedia::Audio::itemAboutToBeInserted(start, end) + \qmlsignal QtMultimedia::Playlist::itemAboutToBeInserted(start, end) This signal is emitted when items are to be inserted into the playlist at \a start and ending at \a end. @@ -606,7 +606,7 @@ void QDeclarativePlaylist::componentComplete() */ /*! - \qmlsignal QtMultimedia::Audio::itemInserted(start, end) + \qmlsignal QtMultimedia::Playlist::itemInserted(start, end) This signal is emitted after items have been inserted into the playlist. The new items are those between \a start and \a end inclusive. @@ -615,7 +615,7 @@ void QDeclarativePlaylist::componentComplete() */ /*! - \qmlsignal QtMultimedia::Audio::itemAboutToBeRemoved(start, end) + \qmlsignal QtMultimedia::Playlist::itemAboutToBeRemoved(start, end) This signal emitted when items are to be deleted from the playlist at \a start and ending at \a end. @@ -624,7 +624,7 @@ void QDeclarativePlaylist::componentComplete() */ /*! - \qmlsignal QtMultimedia::Audio::itemRemoved(start, end) + \qmlsignal QtMultimedia::Playlist::itemRemoved(start, end) This signal is emitted after items have been removed from the playlist. The removed items are those between \a start and \a end inclusive. @@ -633,7 +633,7 @@ void QDeclarativePlaylist::componentComplete() */ /*! - \qmlsignal QtMultimedia::Audio::itemChanged(start, end) + \qmlsignal QtMultimedia::Playlist::itemChanged(start, end) This signal is emitted after items have been changed in the playlist between \a start and \a end positions inclusive. @@ -642,7 +642,7 @@ void QDeclarativePlaylist::componentComplete() */ /*! - \qmlsignal QtMultimedia::Audio::loaded() + \qmlsignal QtMultimedia::Playlist::loaded() This signal is emitted when the playlist loading succeeded. @@ -650,7 +650,7 @@ void QDeclarativePlaylist::componentComplete() */ /*! - \qmlsignal QtMultimedia::Audio::loadFailed() + \qmlsignal QtMultimedia::Playlist::loadFailed() This signal is emitted when the playlist loading failed. \l error and \l errorString can be checked for more information on the failure. |