summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYoann Lopes <yoann.lopes@digia.com>2014-06-03 16:50:56 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-06-10 15:02:24 +0200
commitb99a4b3025f08df8f33efb02897397ae5e404acf (patch)
tree6f9fc0289c329022551bcc54ff6279974c9599eb
parenteadf1c8c41a41509a7c87b44d66b48cb8345acdb (diff)
Make multimedia QML types available for the 5.3 import version.
At least one type needs to be registered with the 5.3 version number to make it known to the QML engine. Change-Id: Iacfe62650b4194fbb89135fef7cb148309227ce2 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
-rw-r--r--src/imports/multimedia/multimedia.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp
index 94b697e85..5954db22c 100644
--- a/src/imports/multimedia/multimedia.cpp
+++ b/src/imports/multimedia/multimedia.cpp
@@ -95,6 +95,11 @@ public:
qmlRegisterUncreatableType<QDeclarativeCameraImageProcessing>(uri, 5, 0, "CameraImageProcessing",
trUtf8("CameraImageProcessing is provided by Camera"));
+ // Make types available for the 5.3 version
+ // Adding "import QtMultimedia 5.3" in QML will fail unless at least one type is registered
+ // for that version.
+ qmlRegisterType<QSoundEffect>(uri, 5, 3, "SoundEffect");
+
qmlRegisterType<QDeclarativeMediaMetaData>();
}