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

Conflicts:
	.qmake.conf

Change-Id: Id367a610a3aefd288bfe287a3bf64606e582deb9

4 files changed, 17 insertions, 8 deletions

diff --git a/tests/auto/integration/multimedia.pro b/tests/auto/integration/multimedia.pro
index 1daa1ee50..88960ec03 100644
--- a/tests/auto/integration/multimedia.pro
+++ b/tests/auto/integration/multimedia.pro
@@ -5,11 +5,15 @@ SUBDIRS += \
     qaudiodeviceinfo \
     qaudioinput \
     qaudiooutput \
-    qdeclarativevideooutput \
-    qdeclarativevideooutput_window \
     qmediaplayerbackend \
     qcamerabackend \
     qsoundeffect \
     qsound
 
+qtHaveModule(quick) {
+    SUBDIRS += \
+        qdeclarativevideooutput \
+        qdeclarativevideooutput_window
+}
+
 !qtHaveModule(widgets): SUBDIRS -= qcamerabackend
diff --git a/tests/auto/unit/multimedia.pro b/tests/auto/unit/multimedia.pro
index 309d41255..f9bf0f35f 100644
--- a/tests/auto/unit/multimedia.pro
+++ b/tests/auto/unit/multimedia.pro
@@ -30,13 +30,7 @@ SUBDIRS += \
     qvideosurfaceformat \
     qwavedecoder \
     qaudiobuffer \
-    qdeclarativeaudio \
     qaudiodecoder \
     qaudioprobe \
     qvideoprobe \
     qsamplecache
-
-disabled {
-    SUBDIRS += \
-        qdeclarativevideo
-}
diff --git a/tests/auto/unit/multimediaqml.pro b/tests/auto/unit/multimediaqml.pro
new file mode 100644
index 000000000..cadd956ec
--- /dev/null
+++ b/tests/auto/unit/multimediaqml.pro
@@ -0,0 +1,10 @@
+
+TEMPLATE = subdirs
+SUBDIRS += \
+    qdeclarativeaudio \
+
+disabled {
+    SUBDIRS += \
+        qdeclarativevideo
+}
+
diff --git a/tests/auto/unit/unit.pro b/tests/auto/unit/unit.pro
index 96dbf0137..37f85209e 100644
--- a/tests/auto/unit/unit.pro
+++ b/tests/auto/unit/unit.pro
@@ -2,3 +2,4 @@ TEMPLATE = subdirs
 
 SUBDIRS += multimedia.pro
 qtHaveModule(widgets): SUBDIRS += multimediawidgets.pro
+qtHaveModule(qml): SUBDIRS += multimediaqml.pro