diff options
author | James McDonnell <jmcdonnell@blackberry.com> | 2017-03-28 17:23:25 -0400 |
---|---|---|
committer | James McDonnell <jmcdonnell@blackberry.com> | 2017-10-23 14:10:43 +0000 |
commit | 82694e41b1d37e04ecc911f420ad4317220f8180 (patch) | |
tree | 831804b09c5fc36be0e103444c596149771d4a78 /src/imports/multimedia/multimedia.cpp | |
parent | 66c0334a3c4cb8deb63c67aa70da3f4ed94f89a4 (diff) |
Propagate customAudioRole into the QML classes
Propagate customAudioRole into the Audio, MediaPlayer and Video
classes.
[ChangeLog][Audio/Video/MediaPlayer] Added customAudioRole string
property to enable use of audio roles beyond those available via the
audioRole enum property.
Change-Id: If3c4ec20f014653d31d1fa0d1ad925084f446478
Reviewed-by: Christian Stromme <christian.stromme@qt.io>
Diffstat (limited to 'src/imports/multimedia/multimedia.cpp')
-rw-r--r-- | src/imports/multimedia/multimedia.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp index 6a316a298..a95ababfb 100644 --- a/src/imports/multimedia/multimedia.cpp +++ b/src/imports/multimedia/multimedia.cpp @@ -151,6 +151,10 @@ public: qmlRegisterUncreatableType<QDeclarativeCameraFlash, 1>(uri, 5, 9, "CameraFlash", trUtf8("CameraFlash is provided by Camera")); + // 5.11 types + qmlRegisterType<QDeclarativeAudio, 3>(uri, 5, 11, "Audio"); + qmlRegisterType<QDeclarativeAudio, 3>(uri, 5, 11, "MediaPlayer"); + qmlRegisterType<QDeclarativeMediaMetaData>(); qmlRegisterType<QAbstractVideoFilter>(); } |