summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@theqtcompany.com>2016-04-29 12:57:58 +0200
committerYoann Lopes <yoann.lopes@qt.io>2016-04-29 13:23:19 +0000
commite23176461b9b62939dbf2ad542780446fa8a8163 (patch)
tree3efa674325265d055929d070a1441a08d9f559a6
parent5c4772b4647344bf31402323e3af11b5c8e4f29d (diff)
Add new QDeclarativePlayList 5.7 items with new QML revision
Change-Id: I1f332230e34e04a304cbe6d9b6d4a4dceb70095b Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
-rw-r--r--src/imports/multimedia/multimedia.cpp3
-rw-r--r--src/imports/multimedia/qdeclarativeplaylist_p.h8
2 files changed, 7 insertions, 4 deletions
diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp
index 0ebe5cd0e..ae00e4413 100644
--- a/src/imports/multimedia/multimedia.cpp
+++ b/src/imports/multimedia/multimedia.cpp
@@ -135,6 +135,9 @@ public:
qmlRegisterType<QDeclarativePlaylist>(uri, 5, 6, "Playlist");
qmlRegisterType<QDeclarativePlaylistItem>(uri, 5, 6, "PlaylistItem");
+ // 5.7 types
+ qmlRegisterType<QDeclarativePlaylist, 1>(uri, 5, 7, "Playlist");
+
qmlRegisterType<QDeclarativeMediaMetaData>();
qmlRegisterType<QAbstractVideoFilter>();
}
diff --git a/src/imports/multimedia/qdeclarativeplaylist_p.h b/src/imports/multimedia/qdeclarativeplaylist_p.h
index 50869e422..22c853605 100644
--- a/src/imports/multimedia/qdeclarativeplaylist_p.h
+++ b/src/imports/multimedia/qdeclarativeplaylist_p.h
@@ -158,12 +158,12 @@ public Q_SLOTS:
void load(const QUrl &location, const QString &format = QString());
bool save(const QUrl &location, const QString &format = QString());
bool addItem(const QUrl &source);
- bool addItems(const QList<QUrl> &sources);
+ Q_REVISION(1) bool addItems(const QList<QUrl> &sources);
bool insertItem(int index, const QUrl &source);
- bool insertItems(int index, const QList<QUrl> &sources);
- bool moveItem(int from, int to);
+ Q_REVISION(1) bool insertItems(int index, const QList<QUrl> &sources);
+ Q_REVISION(1) bool moveItem(int from, int to);
bool removeItem(int index);
- bool removeItems(int start, int end);
+ Q_REVISION(1) bool removeItems(int start, int end);
bool clear();
Q_SIGNALS: