Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev

2013-10-01 09:13:55 +02:00
parent 957084ac1b 5e83f0927c
commit 85aadf8cb2
6 changed files with 36 additions and 27 deletions
--- a/src/plugins/android/src/android_mediaservice.json
+++ b/src/plugins/android/src/android_mediaservice.json
@@ -1,3 +1,4 @@
 {
-    "Keys": ["org.qt-project.qt.camera", "org.qt-project.qt.mediaplayer", "org.qt-project.qt.audiosource"]
+    "Keys": ["androidmultimedia"],
+    "Services": ["org.qt-project.qt.camera", "org.qt-project.qt.mediaplayer", "org.qt-project.qt.audiosource"]
 }