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

Change-Id: Ia5060cb07311256caa0a8c7f03af292ce3a26213
2013-11-26 10:53:44 +01:00
parent 6799e9eab0 041e75d1c0
commit 64b9b93eb4
5 changed files with 60 additions and 2 deletions
--- a/src/imports/multimedia/qmldir
+++ b/src/imports/multimedia/qmldir
@@ -3,4 +3,3 @@ plugin declarative_multimedia
 classname QMultimediaDeclarativeModule
 typeinfo plugins.qmltypes
 Video 5.0 Video.qml
-classname QMultimediaDeclarativeModule
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -13,7 +13,8 @@ android {
 }

 qnx {
-    SUBDIRS += qnx audiocapture
+    config_mmrenderer: SUBDIRS += qnx
+    SUBDIRS += audiocapture
 }

 qnx:!blackberry {