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

Conflicts: .qmake.conf Change-Id: Id367a610a3aefd288bfe287a3bf64606e582deb9
2014-01-17 17:20:59 +01:00
parent 16aadf964d 88ef2bf83d
commit 422099e8dd
35 changed files with 290 additions and 115 deletions
--- 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
--- 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
-}
--- a/tests/auto/unit/multimediaqml.pro
+++ b/tests/auto/unit/multimediaqml.pro
@@ -0,0 +1,10 @@
+
+TEMPLATE = subdirs
+SUBDIRS += \
+    qdeclarativeaudio \
+
+disabled {
+    SUBDIRS += \
+        qdeclarativevideo
+}
+
--- 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