3 files changed, 39 insertions, 28 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index b3a5771a2..a8160c376 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -1,6 +1,7 @@
 TEMPLATE = subdirs
 
-SUBDIRS+=multimedia.pro
+SUBDIRS += multimedia.pro
+contains(QT_CONFIG,multimediakitwidgets): SUBDIRS += multimediawidgets.pro
 
 # These autotests consist of things such as static code checks
 # which require that the autotest is run on the same machine
diff --git a/tests/auto/multimedia.pro b/tests/auto/multimedia.pro
index 9bacbbff6..d79522d98 100644
--- a/tests/auto/multimedia.pro
+++ b/tests/auto/multimedia.pro
@@ -8,15 +8,9 @@ SUBDIRS += \
     qaudioformat \
     qaudioinput \
     qaudiooutput \
-    qcamera \
-    qcamerabackend \
-    qcameraimagecapture \
-    qcameraviewfinder \
     qmediabindableinterface \
     qmediacontainercontrol \
     qmediacontent \
-    qmediaobject \
-    qmediaplayer \
     qmediaplayerbackend \
     qmediaplaylistnavigator \
     qmediarecorder \
@@ -29,9 +23,6 @@ SUBDIRS += \
     qmetadatareadercontrol \
     qmetadatawritercontrol \
 
-# This is disabled because it is unfinished
-# qmediastreamscontrol \
-
 # These is disabled until intent is clearer
 #    qvideodevicecontrol \
 #    qvideoencodercontrol \
@@ -44,24 +35,15 @@ SUBDIRS += \
 # Tests depending on private interfaces should only be built if
 # these interfaces are exported.
 contains (QT_CONFIG, private_tests) {
-  SUBDIRS += \
-    qgraphicsvideoitem \
-    qmediaimageviewer \
-    qmediaplaylist \
-    qmediapluginloader \
-    qmediaserviceprovider \
-    qpaintervideosurface \
-    qvideowidget \
-}
-
-contains (QT_CONFIG, declarative) {
-  # All the declarative tests depend on private interfaces
-  contains (QT_CONFIG, private_tests) {
     SUBDIRS += \
-    qsoundeffect \
-    qdeclarativeaudio \
-
+        qmediaplaylist \
+        qmediapluginloader \
+        qmediaserviceprovider
 
-    disabled:SUBDIRS += qdeclarativevideo
-  }
+    contains (QT_CONFIG, declarative) {
+  # All the declarative tests depend on private interfaces
+        SUBDIRS += \
+            qsoundeffect \
+            qdeclarativeaudio
+    }
 }
diff --git a/tests/auto/multimediawidgets.pro b/tests/auto/multimediawidgets.pro
new file mode 100644
index 000000000..1bd2e4e20
--- /dev/null
+++ b/tests/auto/multimediawidgets.pro
@@ -0,0 +1,28 @@
+
+TEMPLATE = subdirs
+SUBDIRS += \
+    qcamera \
+    qcamerabackend \
+    qcameraimagecapture \
+    qcameraviewfinder \
+    qmediaobject \
+    qmediaplayer
+
+# This is a commment for the mock backend directory so that maketestselftest
+# doesn't believe it's an untested directory
+# qmultimedia_common
+
+# Tests depending on private interfaces should only be built if
+# these interfaces are exported.
+contains (QT_CONFIG, private_tests) {
+  SUBDIRS += \
+    qgraphicsvideoitem \
+    qmediaimageviewer \
+    qpaintervideosurface \
+    qvideowidget \
+
+    contains (QT_CONFIG, declarative) {
+        disabled:SUBDIRS += qdeclarativevideo
+    }
+}
+