Merge remote-tracking branch 'origin/release' into stable

Change-Id: I9ad818eecef74983e09660871f39ee66a6b666a1
2013-06-25 23:27:28 +02:00
parent f424e8249b 1c0cfdf408
commit 18a8381ab3
22 changed files with 84 additions and 21 deletions
--- a/src/plugins/blackberry/blackberry_mediaservice.json
+++ b/src/plugins/blackberry/blackberry_mediaservice.json
@@ -1,3 +1,4 @@
 {
-    "Keys": ["org.qt-project.qt.camera", "org.qt-project.qt.mediaplayer"]
+    "Keys": ["blackberrymultimedia"],
+    "Services": ["org.qt-project.qt.camera", "org.qt-project.qt.mediaplayer"]
 }