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

2013-11-26 23:26:26 +01:00
parent 160656d688 64b9b93eb4
commit 1cf737648b
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 {