summaryrefslogtreecommitdiffstats
path: root/src/imports/multimedia/multimedia.cpp
diff options
context:
space:
mode:
authorYoann Lopes <yoann.lopes@theqtcompany.com>2015-09-15 15:22:07 +0200
committerYoann Lopes <yoann.lopes@theqtcompany.com>2015-09-15 14:36:40 +0000
commit0b192ce23ef38ef1f1b8d3dd5d2cfc386c9e5a36 (patch)
tree1925d3253ccc49d9d307987d215fecd958ce9c20 /src/imports/multimedia/multimedia.cpp
parentda6d287e46c107586af07e55043abb4d2a9b2d9e (diff)
Fix QML revisions registration for 5.6.
And update plugins.qmltypes file. Change-Id: I9b3cbeda4c8a0ce88a88f5a16fae6834dc8363d7 Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com> Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
Diffstat (limited to 'src/imports/multimedia/multimedia.cpp')
-rw-r--r--src/imports/multimedia/multimedia.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp
index 4dcb7c61e..f61f97253 100644
--- a/src/imports/multimedia/multimedia.cpp
+++ b/src/imports/multimedia/multimedia.cpp
@@ -116,7 +116,8 @@ public:
qmlRegisterRevision<QDeclarativeCamera, 2>(uri, 5, 5);
// 5.6 types
- qmlRegisterRevision<QDeclarativeAudio, 1>(uri, 5, 6);
+ qmlRegisterType<QDeclarativeAudio, 1>(uri, 5, 6, "Audio");
+ qmlRegisterType<QDeclarativeAudio, 1>(uri, 5, 6, "MediaPlayer");
qmlRegisterType<QDeclarativePlaylist>(uri, 5, 6, "Playlist");
qmlRegisterType<QDeclarativePlaylistItem>(uri, 5, 6, "PlaylistItem");