Cleanup mock backend and tests using it.

Change-Id: I2a77c06ba544c918785fb1d60a54f36a320250f9
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

217 files changed, 532 insertions, 1059 deletions

diff --git a/tests/auto/unit/.prev_CMakeLists.txt b/tests/auto/unit/.prev_CMakeLists.txt
deleted file mode 100644
index 17b5c9b77..000000000
--- a/tests/auto/unit/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-# Generated from unit.pro.
-
-add_subdirectory(qabstractvideobuffer)
-add_subdirectory(qabstractvideosurface)
-add_subdirectory(qaudiorecorder)
-add_subdirectory(qaudioformat)
-add_subdirectory(qaudionamespace)
-add_subdirectory(qcamera)
-add_subdirectory(qcamerainfo)
-add_subdirectory(qcameraimagecapture)
-add_subdirectory(qmediasink)
-add_subdirectory(qmediacontainercontrol)
-add_subdirectory(qmediasource)
-add_subdirectory(qmediaplayer)
-add_subdirectory(qmediaplaylist)
-add_subdirectory(qmediapluginloader)
-add_subdirectory(qmediarecorder)
-add_subdirectory(qmediaservice)
-add_subdirectory(qmediaserviceprovider)
-add_subdirectory(qmediatimerange)
-add_subdirectory(qmetadatareadercontrol)
-add_subdirectory(qmetadatawritercontrol)
-add_subdirectory(qvideoencodersettingscontrol)
-add_subdirectory(qvideoframe)
-add_subdirectory(qvideosurfaceformat)
-add_subdirectory(qwavedecoder)
-add_subdirectory(qaudiobuffer)
-add_subdirectory(qaudiodecoder)
-add_subdirectory(qaudioprobe)
-add_subdirectory(qvideoprobe)
-add_subdirectory(qsamplecache)
-    add_subdirectory(qcamerawidgets)
-    add_subdirectory(qmediaplayerwidgets)
-    if(QT_FEATURE_private_tests)
-        add_subdirectory(qgraphicsvideoitem)
-        add_subdirectory(qpaintervideosurface)
-        add_subdirectory(qvideowidget)
-    endif()
-    add_subdirectory(qdeclarativemultimediaglobal)
-    add_subdirectory(qdeclarativeaudio)
-    add_subdirectory(qdeclarativecamera)
-    if(disabled)
-        add_subdirectory(qdeclarativevideo)
-    endif()
-if(TARGET Qt::Widgets)
-    add_subdirectory(qcamerawidgets)
-    add_subdirectory(qmediaplayerwidgets)
-endif()
-if(QT_FEATURE_private_tests AND TARGET Qt::Widgets)
-    add_subdirectory(qgraphicsvideoitem)
-    add_subdirectory(qpaintervideosurface)
-    add_subdirectory(qvideowidget)
-endif()
-if(TARGET Qt::Qml)
-    add_subdirectory(qdeclarativemultimediaglobal)
-    add_subdirectory(qdeclarativeaudio)
-    add_subdirectory(qdeclarativecamera)
-endif()
-if(TARGET Qt::Qml AND disabled)
-    add_subdirectory(qdeclarativevideo)
-endif()
-add_subdirectory(qabstractvideobuffer)
-add_subdirectory(qabstractvideosurface)
-add_subdirectory(qaudiorecorder)
-add_subdirectory(qaudioformat)
-add_subdirectory(qaudionamespace)
-add_subdirectory(qcamera)
-add_subdirectory(qcamerainfo)
-add_subdirectory(qcameraimagecapture)
-add_subdirectory(qmediasink)
-add_subdirectory(qmediacontainercontrol)
-add_subdirectory(qmediasource)
-add_subdirectory(qmediaplayer)
-add_subdirectory(qmediaplaylist)
-add_subdirectory(qmediapluginloader)
-add_subdirectory(qmediarecorder)
-add_subdirectory(qmediaservice)
-add_subdirectory(qmediaserviceprovider)
-add_subdirectory(qmediatimerange)
-add_subdirectory(qmetadatareadercontrol)
-add_subdirectory(qmetadatawritercontrol)
-add_subdirectory(qvideoencodersettingscontrol)
-add_subdirectory(qvideoframe)
-add_subdirectory(qvideosurfaceformat)
-add_subdirectory(qwavedecoder)
-add_subdirectory(qaudiobuffer)
-add_subdirectory(qaudiodecoder)
-add_subdirectory(qaudioprobe)
-add_subdirectory(qvideoprobe)
-add_subdirectory(qsamplecache)
diff --git a/tests/auto/unit/CMakeLists.txt b/tests/auto/unit/CMakeLists.txt
index e27072440..5391288ef 100644
--- a/tests/auto/unit/CMakeLists.txt
+++ b/tests/auto/unit/CMakeLists.txt
@@ -1,50 +1,10 @@
 # Generated from unit.pro.
 
-# special case begin
-add_subdirectory(qabstractvideobuffer)
-add_subdirectory(qabstractvideosurface)
-add_subdirectory(qaudiorecorder)
-add_subdirectory(qaudioformat)
-add_subdirectory(qaudionamespace)
-add_subdirectory(qcamera)
-add_subdirectory(qcamerainfo)
-add_subdirectory(qcameraimagecapture)
-add_subdirectory(qmediasink)
-add_subdirectory(qmediacontainercontrol)
-# add_subdirectory(qmediacontent)
-add_subdirectory(qmediasource)
-add_subdirectory(qmediaplayer)
-add_subdirectory(qmediaplaylist)
-add_subdirectory(qmediapluginloader)
-add_subdirectory(qmediarecorder)
-add_subdirectory(qmediaservice)
-add_subdirectory(qmediatimerange)
-add_subdirectory(qmetadatareadercontrol)
-add_subdirectory(qmetadatawritercontrol)
-add_subdirectory(qvideoencodersettingscontrol)
-add_subdirectory(qvideoframe)
-add_subdirectory(qvideosurfaceformat)
-add_subdirectory(qwavedecoder)
-add_subdirectory(qaudiobuffer)
-add_subdirectory(qaudiodecoder)
-add_subdirectory(qaudioprobe)
-add_subdirectory(qvideoprobe)
-add_subdirectory(qsamplecache)
+add_subdirectory(mockbackend)
+add_subdirectory(multimedia)
 if(TARGET Qt::Widgets)
-    add_subdirectory(qcamerawidgets)
-    add_subdirectory(qmediaplayerwidgets)
-endif()
-if(QT_FEATURE_private_tests AND TARGET Qt::Widgets)
-    add_subdirectory(qgraphicsvideoitem)
-    add_subdirectory(qpaintervideosurface)
-    add_subdirectory(qvideowidget)
+    add_subdirectory(multimediawidgets)
 endif()
 if(TARGET Qt::Qml)
-    add_subdirectory(qdeclarativemultimediaglobal)
-    add_subdirectory(qdeclarativeaudio)
-    add_subdirectory(qdeclarativecamera)
-endif()
-if(TARGET Qt::Qml AND disabled)
-    add_subdirectory(qdeclarativevideo)
+    add_subdirectory(qml)
 endif()
-# special case end
diff --git a/tests/auto/unit/mockbackend/CMakeLists.txt b/tests/auto/unit/mockbackend/CMakeLists.txt
new file mode 100644
index 000000000..3521c2952
--- /dev/null
+++ b/tests/auto/unit/mockbackend/CMakeLists.txt
@@ -0,0 +1,48 @@
+# Generated from mockbackend.pro.
+
+#####################################################################
+## QtMultimediaMockBackend Generic Library:
+#####################################################################
+
+# special case begin
+add_library(QtMultimediaMockBackend INTERFACE)
+target_include_directories(QtMultimediaMockBackend INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
+target_link_libraries(QtMultimediaMockBackend INTERFACE
+    Qt::Core
+    Qt::Gui
+    Qt::MultimediaPrivate
+)
+target_sources(QtMultimediaMockBackend INTERFACE
+    mockaudiodecodercontrol.h
+    mockaudiodecoderservice.h
+    mockaudioencodercontrol.h
+    mockaudioprobecontrol.h
+    mockcameracontrol.h
+    mockcameraexposurecontrol.h
+    mockcamerafocuscontrol.h
+    mockcameraimagecapturecontrol.h
+    mockcameraimageprocessingcontrol.h
+    mockcameraservice.h
+    mockimageencodercontrol.h
+    mockmediacontainercontrol.h
+    mockmediaplayercontrol.h
+    mockmediaplayerservice.h
+    mockmediarecordercontrol.h
+    mockmediarecorderservice.h
+    mockmediaservice.h
+    mockmediaserviceprovider.h
+    mockmediasource.h
+    mockmediastreamscontrol.h
+    mockmetadatareadercontrol.h
+    mockmetadatawritercontrol.h
+    mockvideodeviceselectorcontrol.h
+    mockvideoencodercontrol.h
+    mockvideoprobecontrol.h
+    mockvideorenderercontrol.h
+    mockvideosurface.h
+    mockvideowindowcontrol.h
+)
+# special case end
+
+#### Keys ignored in scope 1:.:.:mockbackend.pro:<TRUE>:
+# TEMPLATE = "lib"
diff --git a/tests/auto/unit/mockbackend/audio.pri b/tests/auto/unit/mockbackend/audio.pri
new file mode 100644
index 000000000..b5349d5eb
--- /dev/null
+++ b/tests/auto/unit/mockbackend/audio.pri
@@ -0,0 +1,4 @@
+INCLUDEPATH += $$PWD
+HEADERS *= \
+    $$PWD/mockaudiodecoderservice.h \
+    $$PWD/mockaudiodecodercontrol.h
diff --git a/tests/auto/unit/mockbackend/capture.pri b/tests/auto/unit/mockbackend/capture.pri
new file mode 100644
index 000000000..29704d7ff
--- /dev/null
+++ b/tests/auto/unit/mockbackend/capture.pri
@@ -0,0 +1,15 @@
+HEADERS *= \
+    $$PWD/mockaudioencodercontrol.h \
+    $$PWD/mockcameracontrol.h \
+    $$PWD/mockcameraexposurecontrol.h \
+    $$PWD/mockcamerafocuscontrol.h \
+    $$PWD/mockcameraimagecapturecontrol.h \
+    $$PWD/mockcameraimageprocessingcontrol.h \
+    $$PWD/mockcameraservice.h \
+    $$PWD/mockimageencodercontrol.h \
+    $$PWD/mockmediacontainercontrol.h \
+    $$PWD/mockmediarecordercontrol.h \
+    $$PWD/mockmediarecorderservice.h \
+    $$PWD/mockmetadatawritercontrol.h \
+    $$PWD/mockvideodeviceselectorcontrol.h \
+    $$PWD/mockvideoencodercontrol.h \
diff --git a/tests/auto/unit/mockbackend/common.pri b/tests/auto/unit/mockbackend/common.pri
new file mode 100644
index 000000000..dae521d54
--- /dev/null
+++ b/tests/auto/unit/mockbackend/common.pri
@@ -0,0 +1,8 @@
+INCLUDEPATH += $$PWD
+HEADERS += \
+    $$PWD/mockmediaservice.h \
+    $$PWD/mockmediaserviceprovider.h \
+    $$PWD/mockmediasource.h \
+    $$PWD/mockvideorenderercontrol.h \
+    $$PWD/mockvideowindowcontrol.h \
+    $$PWD/mockvideosurface.h
diff --git a/tests/auto/unit/qmultimedia_common/mockaudiodecodercontrol.h b/tests/auto/unit/mockbackend/mockaudiodecodercontrol.h
index ca9861ca4..ca9861ca4 100644
--- a/tests/auto/unit/qmultimedia_common/mockaudiodecodercontrol.h
+++ b/tests/auto/unit/mockbackend/mockaudiodecodercontrol.h
diff --git a/tests/auto/unit/qmultimedia_common/mockaudiodecoderservice.h b/tests/auto/unit/mockbackend/mockaudiodecoderservice.h
index 85da10d3a..85da10d3a 100644
--- a/tests/auto/unit/qmultimedia_common/mockaudiodecoderservice.h
+++ b/tests/auto/unit/mockbackend/mockaudiodecoderservice.h
diff --git a/tests/auto/unit/qmultimedia_common/mockaudioencodercontrol.h b/tests/auto/unit/mockbackend/mockaudioencodercontrol.h
index af8f3d0f8..af8f3d0f8 100644
--- a/tests/auto/unit/qmultimedia_common/mockaudioencodercontrol.h
+++ b/tests/auto/unit/mockbackend/mockaudioencodercontrol.h
diff --git a/tests/auto/unit/qmultimedia_common/mockaudioprobecontrol.h b/tests/auto/unit/mockbackend/mockaudioprobecontrol.h
index bb5279db9..bb5279db9 100644
--- a/tests/auto/unit/qmultimedia_common/mockaudioprobecontrol.h
+++ b/tests/auto/unit/mockbackend/mockaudioprobecontrol.h
diff --git a/tests/auto/unit/mockbackend/mockbackend.pri b/tests/auto/unit/mockbackend/mockbackend.pri
new file mode 100644
index 000000000..703bef5e6
--- /dev/null
+++ b/tests/auto/unit/mockbackend/mockbackend.pri
@@ -0,0 +1,2 @@
+INCLUDEPATH += $$PWD
+LIBS += -L$$PWD -lQtMultimediaMockBackend
diff --git a/tests/auto/unit/mockbackend/mockbackend.pro b/tests/auto/unit/mockbackend/mockbackend.pro
new file mode 100644
index 000000000..8347c37bc
--- /dev/null
+++ b/tests/auto/unit/mockbackend/mockbackend.pro
@@ -0,0 +1,10 @@
+TEMPLATE = lib
+TARGET = QtMultimediaMockBackend
+QT = core gui multimedia-private
+CONFIG += staticlib
+
+include(audio.pri)
+include(capture.pri)
+include(common.pri)
+include(player.pri)
+
diff --git a/tests/auto/unit/qmultimedia_common/mockcameracontrol.h b/tests/auto/unit/mockbackend/mockcameracontrol.h
index 5f9ed6c9f..5f9ed6c9f 100644
--- a/tests/auto/unit/qmultimedia_common/mockcameracontrol.h
+++ b/tests/auto/unit/mockbackend/mockcameracontrol.h
diff --git a/tests/auto/unit/qmultimedia_common/mockcameraexposurecontrol.h b/tests/auto/unit/mockbackend/mockcameraexposurecontrol.h
index 435c272a0..435c272a0 100644
--- a/tests/auto/unit/qmultimedia_common/mockcameraexposurecontrol.h
+++ b/tests/auto/unit/mockbackend/mockcameraexposurecontrol.h
diff --git a/tests/auto/unit/qmultimedia_common/mockcamerafocuscontrol.h b/tests/auto/unit/mockbackend/mockcamerafocuscontrol.h
index 508b243d2..508b243d2 100644
--- a/tests/auto/unit/qmultimedia_common/mockcamerafocuscontrol.h
+++ b/tests/auto/unit/mockbackend/mockcamerafocuscontrol.h
diff --git a/tests/auto/unit/qmultimedia_common/mockcameraimagecapturecontrol.h b/tests/auto/unit/mockbackend/mockcameraimagecapturecontrol.h
index f3203ee23..f3203ee23 100644
--- a/tests/auto/unit/qmultimedia_common/mockcameraimagecapturecontrol.h
+++ b/tests/auto/unit/mockbackend/mockcameraimagecapturecontrol.h
diff --git a/tests/auto/unit/qmultimedia_common/mockcameraimageprocessingcontrol.h b/tests/auto/unit/mockbackend/mockcameraimageprocessingcontrol.h
index 6f315c69e..6f315c69e 100644
--- a/tests/auto/unit/qmultimedia_common/mockcameraimageprocessingcontrol.h
+++ b/tests/auto/unit/mockbackend/mockcameraimageprocessingcontrol.h
diff --git a/tests/auto/unit/qmultimedia_common/mockcameraservice.h b/tests/auto/unit/mockbackend/mockcameraservice.h
index aa5277f79..8d3f2a238 100644
--- a/tests/auto/unit/qmultimedia_common/mockcameraservice.h
+++ b/tests/auto/unit/mockbackend/mockcameraservice.h
@@ -30,16 +30,16 @@
 #define MOCKCAMERASERVICE_H
 
 #include "qmediaservice.h"
-#include "../qmultimedia_common/mockcamerafocuscontrol.h"
-#include "../qmultimedia_common/mockcameraimageprocessingcontrol.h"
-#include "../qmultimedia_common/mockcameraimagecapturecontrol.h"
-#include "../qmultimedia_common/mockcameraexposurecontrol.h"
-#include "../qmultimedia_common/mockimageencodercontrol.h"
-#include "../qmultimedia_common/mockcameracontrol.h"
-#include "../qmultimedia_common/mockvideosurface.h"
-#include "../qmultimedia_common/mockvideorenderercontrol.h"
-#include "../qmultimedia_common/mockvideowindowcontrol.h"
-#include "../qmultimedia_common/mockvideodeviceselectorcontrol.h"
+#include "mockcamerafocuscontrol.h"
+#include "mockcameraimageprocessingcontrol.h"
+#include "mockcameraimagecapturecontrol.h"
+#include "mockcameraexposurecontrol.h"
+#include "mockimageencodercontrol.h"
+#include "mockcameracontrol.h"
+#include "mockvideosurface.h"
+#include "mockvideorenderercontrol.h"
+#include "mockvideowindowcontrol.h"
+#include "mockvideodeviceselectorcontrol.h"
 
 class MockSimpleCameraService : public QMediaService
 {
diff --git a/tests/auto/unit/qmultimedia_common/mockimageencodercontrol.h b/tests/auto/unit/mockbackend/mockimageencodercontrol.h
index f03e15959..f03e15959 100644
--- a/tests/auto/unit/qmultimedia_common/mockimageencodercontrol.h
+++ b/tests/auto/unit/mockbackend/mockimageencodercontrol.h
diff --git a/tests/auto/unit/qmultimedia_common/mockmediacontainercontrol.h b/tests/auto/unit/mockbackend/mockmediacontainercontrol.h
index 08562a469..08562a469 100644
--- a/tests/auto/unit/qmultimedia_common/mockmediacontainercontrol.h
+++ b/tests/auto/unit/mockbackend/mockmediacontainercontrol.h
diff --git a/tests/auto/unit/qmultimedia_common/mockmediaplayercontrol.h b/tests/auto/unit/mockbackend/mockmediaplayercontrol.h
index 18c843dca..18c843dca 100644
--- a/tests/auto/unit/qmultimedia_common/mockmediaplayercontrol.h
+++ b/tests/auto/unit/mockbackend/mockmediaplayercontrol.h
diff --git a/tests/auto/unit/qmultimedia_common/mockmediaplayerservice.h b/tests/auto/unit/mockbackend/mockmediaplayerservice.h
index 0ae7050e8..0ae7050e8 100644
--- a/tests/auto/unit/qmultimedia_common/mockmediaplayerservice.h
+++ b/tests/auto/unit/mockbackend/mockmediaplayerservice.h
diff --git a/tests/auto/unit/qmultimedia_common/mockmediarecordercontrol.h b/tests/auto/unit/mockbackend/mockmediarecordercontrol.h
index 4c7b4d165..4c7b4d165 100644
--- a/tests/auto/unit/qmultimedia_common/mockmediarecordercontrol.h
+++ b/tests/auto/unit/mockbackend/mockmediarecordercontrol.h
diff --git a/tests/auto/unit/qmultimedia_common/mockmediarecorderservice.h b/tests/auto/unit/mockbackend/mockmediarecorderservice.h
index 9cd424882..9cd424882 100644
--- a/tests/auto/unit/qmultimedia_common/mockmediarecorderservice.h
+++ b/tests/auto/unit/mockbackend/mockmediarecorderservice.h
diff --git a/tests/auto/unit/qmultimedia_common/mockmediaservice.h b/tests/auto/unit/mockbackend/mockmediaservice.h
index 977ef7237..977ef7237 100644
--- a/tests/auto/unit/qmultimedia_common/mockmediaservice.h
+++ b/tests/auto/unit/mockbackend/mockmediaservice.h
diff --git a/tests/auto/unit/qmultimedia_common/mockmediaserviceprovider.h b/tests/auto/unit/mockbackend/mockmediaserviceprovider.h
index 360f6f74d..6542bbffa 100644
--- a/tests/auto/unit/qmultimedia_common/mockmediaserviceprovider.h
+++ b/tests/auto/unit/mockbackend/mockmediaserviceprovider.h
@@ -29,7 +29,7 @@
 #ifndef MOCKMEDIASERVICEPROVIDER_H
 #define MOCKMEDIASERVICEPROVIDER_H
 
-#include "qmediaserviceprovider_p.h"
+#include "private/qmediaserviceprovider_p.h"
 #include "qmediaservice.h"
 #include "mockvideodeviceselectorcontrol.h"
 
diff --git a/tests/auto/unit/qmultimedia_common/mockmediasource.h b/tests/auto/unit/mockbackend/mockmediasource.h
index 5417027a6..5417027a6 100644
--- a/tests/auto/unit/qmultimedia_common/mockmediasource.h
+++ b/tests/auto/unit/mockbackend/mockmediasource.h
diff --git a/tests/auto/unit/qmultimedia_common/mockmediastreamscontrol.h b/tests/auto/unit/mockbackend/mockmediastreamscontrol.h
index 9242dae06..9242dae06 100644
--- a/tests/auto/unit/qmultimedia_common/mockmediastreamscontrol.h
+++ b/tests/auto/unit/mockbackend/mockmediastreamscontrol.h
diff --git a/tests/auto/unit/qmultimedia_common/mockmetadatareadercontrol.h b/tests/auto/unit/mockbackend/mockmetadatareadercontrol.h
index 74352ab06..74352ab06 100644
--- a/tests/auto/unit/qmultimedia_common/mockmetadatareadercontrol.h
+++ b/tests/auto/unit/mockbackend/mockmetadatareadercontrol.h
diff --git a/tests/auto/unit/qmultimedia_common/mockmetadatawritercontrol.h b/tests/auto/unit/mockbackend/mockmetadatawritercontrol.h
index c8cda292e..c8cda292e 100644
--- a/tests/auto/unit/qmultimedia_common/mockmetadatawritercontrol.h
+++ b/tests/auto/unit/mockbackend/mockmetadatawritercontrol.h
diff --git a/tests/auto/unit/qmultimedia_common/mockvideodeviceselectorcontrol.h b/tests/auto/unit/mockbackend/mockvideodeviceselectorcontrol.h
index 764c062b9..764c062b9 100644
--- a/tests/auto/unit/qmultimedia_common/mockvideodeviceselectorcontrol.h
+++ b/tests/auto/unit/mockbackend/mockvideodeviceselectorcontrol.h
diff --git a/tests/auto/unit/qmultimedia_common/mockvideoencodercontrol.h b/tests/auto/unit/mockbackend/mockvideoencodercontrol.h
index a1ee8ff9f..a1ee8ff9f 100644
--- a/tests/auto/unit/qmultimedia_common/mockvideoencodercontrol.h
+++ b/tests/auto/unit/mockbackend/mockvideoencodercontrol.h
diff --git a/tests/auto/unit/qmultimedia_common/mockvideoprobecontrol.h b/tests/auto/unit/mockbackend/mockvideoprobecontrol.h
index 6d953c2a7..6d953c2a7 100644
--- a/tests/auto/unit/qmultimedia_common/mockvideoprobecontrol.h
+++ b/tests/auto/unit/mockbackend/mockvideoprobecontrol.h
diff --git a/tests/auto/unit/qmultimedia_common/mockvideorenderercontrol.h b/tests/auto/unit/mockbackend/mockvideorenderercontrol.h
index 9c2265426..9c2265426 100644
--- a/tests/auto/unit/qmultimedia_common/mockvideorenderercontrol.h
+++ b/tests/auto/unit/mockbackend/mockvideorenderercontrol.h
diff --git a/tests/auto/unit/qmultimedia_common/mockvideosurface.h b/tests/auto/unit/mockbackend/mockvideosurface.h
index d9cd4aec9..d9cd4aec9 100644
--- a/tests/auto/unit/qmultimedia_common/mockvideosurface.h
+++ b/tests/auto/unit/mockbackend/mockvideosurface.h
diff --git a/tests/auto/unit/qmultimedia_common/mockvideowindowcontrol.h b/tests/auto/unit/mockbackend/mockvideowindowcontrol.h
index 13dad3b20..13dad3b20 100644
--- a/tests/auto/unit/qmultimedia_common/mockvideowindowcontrol.h
+++ b/tests/auto/unit/mockbackend/mockvideowindowcontrol.h
diff --git a/tests/auto/unit/mockbackend/player.pri b/tests/auto/unit/mockbackend/player.pri
new file mode 100644
index 000000000..596b39e7d
--- /dev/null
+++ b/tests/auto/unit/mockbackend/player.pri
@@ -0,0 +1,9 @@
+INCLUDEPATH += $$PWD
+HEADERS += \
+    $$PWD/mockaudioprobecontrol.h \
+    $$PWD/mockmediaplayercontrol.h \
+    $$PWD/mockmediaplayerservice.h \
+    $$PWD/mockmediastreamscontrol.h \
+    $$PWD/mockmetadatareadercontrol.h \
+    $$PWD/mockvideoprobecontrol.h
+    
diff --git a/tests/auto/unit/multimedia/CMakeLists.txt b/tests/auto/unit/multimedia/CMakeLists.txt
new file mode 100644
index 000000000..77f35e377
--- /dev/null
+++ b/tests/auto/unit/multimedia/CMakeLists.txt
@@ -0,0 +1,29 @@
+# Generated from multimedia.pro.
+
+add_subdirectory(qabstractvideobuffer)
+add_subdirectory(qabstractvideosurface)
+add_subdirectory(qaudiorecorder)
+add_subdirectory(qaudioformat)
+add_subdirectory(qaudionamespace)
+add_subdirectory(qcamera)
+add_subdirectory(qcamerainfo)
+add_subdirectory(qcameraimagecapture)
+add_subdirectory(qmediasink)
+add_subdirectory(qmediacontainercontrol)
+add_subdirectory(qmediasource)
+add_subdirectory(qmediaplayer)
+add_subdirectory(qmediaplaylist)
+add_subdirectory(qmediapluginloader)
+add_subdirectory(qmediarecorder)
+add_subdirectory(qmediaservice)
+add_subdirectory(qmediatimerange)
+add_subdirectory(qmetadatareadercontrol)
+add_subdirectory(qmetadatawritercontrol)
+add_subdirectory(qvideoencodersettingscontrol)
+add_subdirectory(qvideoframe)
+add_subdirectory(qvideosurfaceformat)
+add_subdirectory(qaudiobuffer)
+add_subdirectory(qaudiodecoder)
+add_subdirectory(qaudioprobe)
+add_subdirectory(qvideoprobe)
+add_subdirectory(qsamplecache)
diff --git a/tests/auto/unit/multimedia.pro b/tests/auto/unit/multimedia/multimedia.pro
index d6c826436..e13c037c5 100644
--- a/tests/auto/unit/multimedia.pro
+++ b/tests/auto/unit/multimedia/multimedia.pro
@@ -23,7 +23,7 @@ SUBDIRS += \
     qvideoencodersettingscontrol \
     qvideoframe \
     qvideosurfaceformat \
-    qwavedecoder \
+#    qwavedecoder \
     qaudiobuffer \
     qaudiodecoder \
     qaudioprobe \
diff --git a/tests/auto/unit/qabstractvideobuffer/CMakeLists.txt b/tests/auto/unit/multimedia/qabstractvideobuffer/CMakeLists.txt
index a50985dbe..a50985dbe 100644
--- a/tests/auto/unit/qabstractvideobuffer/CMakeLists.txt
+++ b/tests/auto/unit/multimedia/qabstractvideobuffer/CMakeLists.txt
diff --git a/tests/auto/unit/qabstractvideobuffer/qabstractvideobuffer.pro b/tests/auto/unit/multimedia/qabstractvideobuffer/qabstractvideobuffer.pro
index f97ea41c3..f97ea41c3 100644
--- a/tests/auto/unit/qabstractvideobuffer/qabstractvideobuffer.pro
+++ b/tests/auto/unit/multimedia/qabstractvideobuffer/qabstractvideobuffer.pro
diff --git a/tests/auto/unit/qabstractvideobuffer/tst_qabstractvideobuffer.cpp b/tests/auto/unit/multimedia/qabstractvideobuffer/tst_qabstractvideobuffer.cpp
index e11fd6ac0..e11fd6ac0 100644
--- a/tests/auto/unit/qabstractvideobuffer/tst_qabstractvideobuffer.cpp
+++ b/tests/auto/unit/multimedia/qabstractvideobuffer/tst_qabstractvideobuffer.cpp
diff --git a/tests/auto/unit/qabstractvideosurface/CMakeLists.txt b/tests/auto/unit/multimedia/qabstractvideosurface/CMakeLists.txt
index b09b43eff..b09b43eff 100644
--- a/tests/auto/unit/qabstractvideosurface/CMakeLists.txt
+++ b/tests/auto/unit/multimedia/qabstractvideosurface/CMakeLists.txt
diff --git a/tests/auto/unit/qabstractvideosurface/qabstractvideosurface.pro b/tests/auto/unit/multimedia/qabstractvideosurface/qabstractvideosurface.pro
index 1f2e47d59..1f2e47d59 100644
--- a/tests/auto/unit/qabstractvideosurface/qabstractvideosurface.pro
+++ b/tests/auto/unit/multimedia/qabstractvideosurface/qabstractvideosurface.pro
diff --git a/tests/auto/unit/qabstractvideosurface/tst_qabstractvideosurface.cpp b/tests/auto/unit/multimedia/qabstractvideosurface/tst_qabstractvideosurface.cpp
index 3768eb0f4..3768eb0f4 100644
--- a/tests/auto/unit/qabstractvideosurface/tst_qabstractvideosurface.cpp
+++ b/tests/auto/unit/multimedia/qabstractvideosurface/tst_qabstractvideosurface.cpp
diff --git a/tests/auto/unit/qaudiobuffer/CMakeLists.txt b/tests/auto/unit/multimedia/qaudiobuffer/CMakeLists.txt
index 22ca3aae1..22ca3aae1 100644
--- a/tests/auto/unit/qaudiobuffer/CMakeLists.txt
+++ b/tests/auto/unit/multimedia/qaudiobuffer/CMakeLists.txt
diff --git a/tests/auto/unit/qaudiobuffer/qaudiobuffer.pro b/tests/auto/unit/multimedia/qaudiobuffer/qaudiobuffer.pro
index 8f8f54ac3..8f8f54ac3 100644
--- a/tests/auto/unit/qaudiobuffer/qaudiobuffer.pro
+++ b/tests/auto/unit/multimedia/qaudiobuffer/qaudiobuffer.pro
diff --git a/tests/auto/unit/qaudiobuffer/tst_qaudiobuffer.cpp b/tests/auto/unit/multimedia/qaudiobuffer/tst_qaudiobuffer.cpp
index 7f5ddc7bd..7f5ddc7bd 100644
--- a/tests/auto/unit/qaudiobuffer/tst_qaudiobuffer.cpp
+++ b/tests/auto/unit/multimedia/qaudiobuffer/tst_qaudiobuffer.cpp
diff --git a/tests/auto/unit/multimedia/qaudiodecoder/CMakeLists.txt b/tests/auto/unit/multimedia/qaudiodecoder/CMakeLists.txt
new file mode 100644
index 000000000..6463110b9
--- /dev/null
+++ b/tests/auto/unit/multimedia/qaudiodecoder/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from qaudiodecoder.pro.
+
+#####################################################################
+## tst_qaudiodecoder Test:
+#####################################################################
+
+qt_add_test(tst_qaudiodecoder
+    SOURCES
+        tst_qaudiodecoder.cpp
+    INCLUDE_DIRECTORIES
+        ../../mockbackend
+    PUBLIC_LIBRARIES
+        # Remove: L${CMAKE_CURRENT_SOURCE_DIR}
+        Qt::Gui
+        Qt::Multimedia
+        Qt::MultimediaPrivate
+        QtMultimediaMockBackend
+)
diff --git a/tests/auto/unit/multimedia/qaudiodecoder/qaudiodecoder.pro b/tests/auto/unit/multimedia/qaudiodecoder/qaudiodecoder.pro
new file mode 100644
index 000000000..4d623edce
--- /dev/null
+++ b/tests/auto/unit/multimedia/qaudiodecoder/qaudiodecoder.pro
@@ -0,0 +1,8 @@
+TARGET = tst_qaudiodecoder
+CONFIG += testcase
+
+QT += multimedia multimedia-private testlib gui
+
+include (../../mockbackend/mockbackend.pri)
+
+SOURCES += tst_qaudiodecoder.cpp
diff --git a/tests/auto/unit/qaudiodecoder/tst_qaudiodecoder.cpp b/tests/auto/unit/multimedia/qaudiodecoder/tst_qaudiodecoder.cpp
index 2ab712e21..2ab712e21 100644
--- a/tests/auto/unit/qaudiodecoder/tst_qaudiodecoder.cpp
+++ b/tests/auto/unit/multimedia/qaudiodecoder/tst_qaudiodecoder.cpp
diff --git a/tests/auto/unit/qaudioformat/CMakeLists.txt b/tests/auto/unit/multimedia/qaudioformat/CMakeLists.txt
index 23c7a9db8..23c7a9db8 100644
--- a/tests/auto/unit/qaudioformat/CMakeLists.txt
+++ b/tests/auto/unit/multimedia/qaudioformat/CMakeLists.txt
diff --git a/tests/auto/unit/qaudioformat/qaudioformat.pro b/tests/auto/unit/multimedia/qaudioformat/qaudioformat.pro
index 408200a85..408200a85 100644
--- a/tests/auto/unit/qaudioformat/qaudioformat.pro
+++ b/tests/auto/unit/multimedia/qaudioformat/qaudioformat.pro
diff --git a/tests/auto/unit/qaudioformat/tst_qaudioformat.cpp b/tests/auto/unit/multimedia/qaudioformat/tst_qaudioformat.cpp
index c4be8d577..c4be8d577 100644
--- a/tests/auto/unit/qaudioformat/tst_qaudioformat.cpp
+++ b/tests/auto/unit/multimedia/qaudioformat/tst_qaudioformat.cpp
diff --git a/tests/auto/unit/qaudionamespace/CMakeLists.txt b/tests/auto/unit/multimedia/qaudionamespace/CMakeLists.txt
index 0b1141cf3..0b1141cf3 100644
--- a/tests/auto/unit/qaudionamespace/CMakeLists.txt
+++ b/tests/auto/unit/multimedia/qaudionamespace/CMakeLists.txt
diff --git a/tests/auto/unit/qaudionamespace/qaudionamespace.pro b/tests/auto/unit/multimedia/qaudionamespace/qaudionamespace.pro
index cfe502dc6..cfe502dc6 100644
--- a/tests/auto/unit/qaudionamespace/qaudionamespace.pro
+++ b/tests/auto/unit/multimedia/qaudionamespace/qaudionamespace.pro
diff --git a/tests/auto/unit/qaudionamespace/tst_qaudionamespace.cpp b/tests/auto/unit/multimedia/qaudionamespace/tst_qaudionamespace.cpp
index 5cd89ec3e..5cd89ec3e 100644
--- a/tests/auto/unit/qaudionamespace/tst_qaudionamespace.cpp
+++ b/tests/auto/unit/multimedia/qaudionamespace/tst_qaudionamespace.cpp
diff --git a/tests/auto/unit/multimedia/qaudioprobe/CMakeLists.txt b/tests/auto/unit/multimedia/qaudioprobe/CMakeLists.txt
new file mode 100644
index 000000000..f7725a629
--- /dev/null
+++ b/tests/auto/unit/multimedia/qaudioprobe/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qaudioprobe.pro.
+
+#####################################################################
+## tst_qaudioprobe Test:
+#####################################################################
+
+qt_add_test(tst_qaudioprobe
+    SOURCES
+        tst_qaudioprobe.cpp
+    INCLUDE_DIRECTORIES
+        ../../mockbackend
+    PUBLIC_LIBRARIES
+        # Remove: L${CMAKE_CURRENT_SOURCE_DIR}
+        Qt::Gui
+        Qt::MultimediaPrivate
+        QtMultimediaMockBackend
+)
diff --git a/tests/auto/unit/qaudioprobe/qaudioprobe.pro b/tests/auto/unit/multimedia/qaudioprobe/qaudioprobe.pro
index a83769cc7..ae3d0753b 100644
--- a/tests/auto/unit/qaudioprobe/qaudioprobe.pro
+++ b/tests/auto/unit/multimedia/qaudioprobe/qaudioprobe.pro
@@ -5,6 +5,5 @@ QT += multimedia-private testlib
 
 SOURCES += tst_qaudioprobe.cpp
 
-include (../qmultimedia_common/mock.pri)
-include (../qmultimedia_common/mockrecorder.pri)
+include (../../mockbackend/mockbackend.pri)
 
diff --git a/tests/auto/unit/qaudioprobe/tst_qaudioprobe.cpp b/tests/auto/unit/multimedia/qaudioprobe/tst_qaudioprobe.cpp
index 2392452fb..2392452fb 100644
--- a/tests/auto/unit/qaudioprobe/tst_qaudioprobe.cpp
+++ b/tests/auto/unit/multimedia/qaudioprobe/tst_qaudioprobe.cpp
diff --git a/tests/auto/unit/multimedia/qaudiorecorder/CMakeLists.txt b/tests/auto/unit/multimedia/qaudiorecorder/CMakeLists.txt
new file mode 100644
index 000000000..3515381f9
--- /dev/null
+++ b/tests/auto/unit/multimedia/qaudiorecorder/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qaudiorecorder.pro.
+
+#####################################################################
+## tst_qaudiorecorder Test:
+#####################################################################
+
+qt_add_test(tst_qaudiorecorder
+    SOURCES
+        tst_qaudiorecorder.cpp
+    INCLUDE_DIRECTORIES
+        ../../mockbackend
+    PUBLIC_LIBRARIES
+        # Remove: L${CMAKE_CURRENT_SOURCE_DIR}
+        Qt::Gui
+        Qt::MultimediaPrivate
+        QtMultimediaMockBackend
+)
diff --git a/tests/auto/unit/qaudiorecorder/qaudiorecorder.pro b/tests/auto/unit/multimedia/qaudiorecorder/qaudiorecorder.pro
index a40fba233..8137016cc 100644
--- a/tests/auto/unit/qaudiorecorder/qaudiorecorder.pro
+++ b/tests/auto/unit/multimedia/qaudiorecorder/qaudiorecorder.pro
@@ -5,6 +5,5 @@ QT += multimedia-private testlib
 
 SOURCES += tst_qaudiorecorder.cpp
 
-include (../qmultimedia_common/mock.pri)
-include (../qmultimedia_common/mockrecorder.pri)
+include (../../mockbackend/mockbackend.pri)
 
diff --git a/tests/auto/unit/qaudiorecorder/tst_qaudiorecorder.cpp b/tests/auto/unit/multimedia/qaudiorecorder/tst_qaudiorecorder.cpp
index cdb231dde..cdb231dde 100644
--- a/tests/auto/unit/qaudiorecorder/tst_qaudiorecorder.cpp
+++ b/tests/auto/unit/multimedia/qaudiorecorder/tst_qaudiorecorder.cpp
diff --git a/tests/auto/unit/multimedia/qcamera/CMakeLists.txt b/tests/auto/unit/multimedia/qcamera/CMakeLists.txt
new file mode 100644
index 000000000..39675351d
--- /dev/null
+++ b/tests/auto/unit/multimedia/qcamera/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qcamera.pro.
+
+#####################################################################
+## tst_qcamera Test:
+#####################################################################
+
+qt_add_test(tst_qcamera
+    SOURCES
+        tst_qcamera.cpp
+    INCLUDE_DIRECTORIES
+        ../../mockbackend
+    PUBLIC_LIBRARIES
+        # Remove: L${CMAKE_CURRENT_SOURCE_DIR}
+        Qt::Gui
+        Qt::MultimediaPrivate
+        QtMultimediaMockBackend
+)
diff --git a/tests/auto/unit/qcamera/qcamera.pro b/tests/auto/unit/multimedia/qcamera/qcamera.pro
index baca79829..ceb57f40c 100644
--- a/tests/auto/unit/qcamera/qcamera.pro
+++ b/tests/auto/unit/multimedia/qcamera/qcamera.pro
@@ -3,7 +3,6 @@ TARGET = tst_qcamera
 
 QT += multimedia-private testlib
 
-include (../qmultimedia_common/mock.pri)
-include (../qmultimedia_common/mockcamera.pri)
+include (../../mockbackend/mockbackend.pri)
 
 SOURCES += tst_qcamera.cpp
diff --git a/tests/auto/unit/qcamera/tst_qcamera.cpp b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp
index d942ec3db..d942ec3db 100644
--- a/tests/auto/unit/qcamera/tst_qcamera.cpp
+++ b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp
diff --git a/tests/auto/unit/multimedia/qcameraimagecapture/CMakeLists.txt b/tests/auto/unit/multimedia/qcameraimagecapture/CMakeLists.txt
new file mode 100644
index 000000000..b07fb2a09
--- /dev/null
+++ b/tests/auto/unit/multimedia/qcameraimagecapture/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qcameraimagecapture.pro.
+
+#####################################################################
+## tst_qcameraimagecapture Test:
+#####################################################################
+
+qt_add_test(tst_qcameraimagecapture
+    SOURCES
+        tst_qcameraimagecapture.cpp
+    INCLUDE_DIRECTORIES
+        ../../mockbackend
+    PUBLIC_LIBRARIES
+        # Remove: L${CMAKE_CURRENT_SOURCE_DIR}
+        Qt::Gui
+        Qt::MultimediaPrivate
+        QtMultimediaMockBackend
+)
diff --git a/tests/auto/unit/qcameraimagecapture/qcameraimagecapture.pro b/tests/auto/unit/multimedia/qcameraimagecapture/qcameraimagecapture.pro
index ae92c2d04..cf9bf82ea 100644
--- a/tests/auto/unit/qcameraimagecapture/qcameraimagecapture.pro
+++ b/tests/auto/unit/multimedia/qcameraimagecapture/qcameraimagecapture.pro
@@ -6,5 +6,4 @@ QT += multimedia-private testlib
 SOURCES += \
     tst_qcameraimagecapture.cpp
 
-include (../qmultimedia_common/mock.pri)
-include (../qmultimedia_common/mockcamera.pri)
+include (../../mockbackend/mockbackend.pri)
diff --git a/tests/auto/unit/qcameraimagecapture/tst_qcameraimagecapture.cpp b/tests/auto/unit/multimedia/qcameraimagecapture/tst_qcameraimagecapture.cpp
index f2a5e5fa4..f2a5e5fa4 100644
--- a/tests/auto/unit/qcameraimagecapture/tst_qcameraimagecapture.cpp
+++ b/tests/auto/unit/multimedia/qcameraimagecapture/tst_qcameraimagecapture.cpp
diff --git a/tests/auto/unit/multimedia/qcamerainfo/CMakeLists.txt b/tests/auto/unit/multimedia/qcamerainfo/CMakeLists.txt
new file mode 100644
index 000000000..d9743870c
--- /dev/null
+++ b/tests/auto/unit/multimedia/qcamerainfo/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qcamerainfo.pro.
+
+#####################################################################
+## tst_qcamerainfo Test:
+#####################################################################
+
+qt_add_test(tst_qcamerainfo
+    SOURCES
+        tst_qcamerainfo.cpp
+    INCLUDE_DIRECTORIES
+        ../../mockbackend
+    PUBLIC_LIBRARIES
+        # Remove: L${CMAKE_CURRENT_SOURCE_DIR}
+        Qt::Gui
+        Qt::MultimediaPrivate
+        QtMultimediaMockBackend
+)
diff --git a/tests/auto/unit/qcamerainfo/qcamerainfo.pro b/tests/auto/unit/multimedia/qcamerainfo/qcamerainfo.pro
index 42d8e714e..cc991ac56 100644
--- a/tests/auto/unit/qcamerainfo/qcamerainfo.pro
+++ b/tests/auto/unit/multimedia/qcamerainfo/qcamerainfo.pro
@@ -3,7 +3,6 @@ TARGET = tst_qcamerainfo
 
 QT += multimedia-private testlib
 
-include (../qmultimedia_common/mock.pri)
-include (../qmultimedia_common/mockcamera.pri)
+include (../../mockbackend/mockbackend.pri)
 
 SOURCES += tst_qcamerainfo.cpp
diff --git a/tests/auto/unit/qcamerainfo/tst_qcamerainfo.cpp b/tests/auto/unit/multimedia/qcamerainfo/tst_qcamerainfo.cpp
index 3e5ebd6bc..3e5ebd6bc 100644
--- a/tests/auto/unit/qcamerainfo/tst_qcamerainfo.cpp
+++ b/tests/auto/unit/multimedia/qcamerainfo/tst_qcamerainfo.cpp
diff --git a/tests/auto/unit/qmediacontainercontrol/CMakeLists.txt b/tests/auto/unit/multimedia/qmediacontainercontrol/CMakeLists.txt
index a87844522..c9d9c7bbb 100644
--- a/tests/auto/unit/qmediacontainercontrol/CMakeLists.txt
+++ b/tests/auto/unit/multimedia/qmediacontainercontrol/CMakeLists.txt
@@ -6,14 +6,12 @@
 
 qt_add_test(tst_qmediacontainercontrol
     SOURCES
-        ../qmultimedia_common/mockmediacontainercontrol.h
-        ../qmultimedia_common/mockmetadatareadercontrol.h
-        ../qmultimedia_common/mockmetadatawritercontrol.h
         tst_qmediacontainercontrol.cpp
     INCLUDE_DIRECTORIES
-        ../../../src/multimedia
-        ../qmultimedia_common
+        ../../mockbackend
     PUBLIC_LIBRARIES
+        # Remove: L${CMAKE_CURRENT_SOURCE_DIR}
         Qt::Gui
         Qt::MultimediaPrivate
+        QtMultimediaMockBackend
 )
diff --git a/tests/auto/unit/qmediacontainercontrol/qmediacontainercontrol.pro b/tests/auto/unit/multimedia/qmediacontainercontrol/qmediacontainercontrol.pro
index e13aab7c9..7158bb5dc 100644
--- a/tests/auto/unit/qmediacontainercontrol/qmediacontainercontrol.pro
+++ b/tests/auto/unit/multimedia/qmediacontainercontrol/qmediacontainercontrol.pro
@@ -5,5 +5,5 @@ QT += multimedia-private testlib
 
 SOURCES += tst_qmediacontainercontrol.cpp
 
-include (../qmultimedia_common/mockcontainer.pri)
+include (../../mockbackend/mockbackend.pri)
 
diff --git a/tests/auto/unit/qmediacontainercontrol/tst_qmediacontainercontrol.cpp b/tests/auto/unit/multimedia/qmediacontainercontrol/tst_qmediacontainercontrol.cpp
index e3992a759..616f8e3e3 100644
--- a/tests/auto/unit/qmediacontainercontrol/tst_qmediacontainercontrol.cpp
+++ b/tests/auto/unit/multimedia/qmediacontainercontrol/tst_qmediacontainercontrol.cpp
@@ -32,7 +32,7 @@
 #include "qmediacontainercontrol.h"
 #include "qmediarecorder.h"
 
-#include "../qmultimedia_common/mockmediacontainercontrol.h"
+#include "mockmediacontainercontrol.h"
 
 //MaemoAPI-
 class tst_QMediaContainerControl :public QObject
diff --git a/tests/auto/unit/multimedia/qmediaplayer/CMakeLists.txt b/tests/auto/unit/multimedia/qmediaplayer/CMakeLists.txt
new file mode 100644
index 000000000..51fcc27ad
--- /dev/null
+++ b/tests/auto/unit/multimedia/qmediaplayer/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from qmediaplayer.pro.
+
+#####################################################################
+## tst_qmediaplayer Test:
+#####################################################################
+
+qt_add_test(tst_qmediaplayer
+    SOURCES
+        tst_qmediaplayer.cpp
+    INCLUDE_DIRECTORIES
+        ../../mockbackend
+    PUBLIC_LIBRARIES
+        # Remove: L${CMAKE_CURRENT_SOURCE_DIR}
+        Qt::Gui
+        Qt::MultimediaPrivate
+        Qt::Network
+        QtMultimediaMockBackend
+)
+
+# Resources:
+set(testdata_resource_files
+    "testdata/nokia-tune.mp3"
+)
+
+qt_add_resource(tst_qmediaplayer "testdata"
+    PREFIX
+        "/"
+    FILES
+        ${testdata_resource_files}
+)
+
diff --git a/tests/auto/unit/qmediaplayer/qmediaplayer.pro b/tests/auto/unit/multimedia/qmediaplayer/qmediaplayer.pro
index 7279239e0..6e0dded2c 100644
--- a/tests/auto/unit/qmediaplayer/qmediaplayer.pro
+++ b/tests/auto/unit/multimedia/qmediaplayer/qmediaplayer.pro
@@ -4,5 +4,4 @@ QT += network multimedia-private testlib
 SOURCES += tst_qmediaplayer.cpp
 RESOURCES += testdata.qrc
 
-include (../qmultimedia_common/mock.pri)
-include (../qmultimedia_common/mockplayer.pri)
+include (../../mockbackend/mockbackend.pri)
diff --git a/tests/auto/unit/qmediaplayer/testdata.qrc b/tests/auto/unit/multimedia/qmediaplayer/testdata.qrc
index 1afc630dd..1afc630dd 100644
--- a/tests/auto/unit/qmediaplayer/testdata.qrc
+++ b/tests/auto/unit/multimedia/qmediaplayer/testdata.qrc
diff --git a/tests/auto/unit/qmediaplayer/testdata/nokia-tune.mp3 b/tests/auto/unit/multimedia/qmediaplayer/testdata/nokia-tune.mp3
index 2435f65b8..2435f65b8 100644
--- a/tests/auto/unit/qmediaplayer/testdata/nokia-tune.mp3
+++ b/tests/auto/unit/multimedia/qmediaplayer/testdata/nokia-tune.mp3
diff --git a/tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp b/tests/auto/unit/multimedia/qmediaplayer/tst_qmediaplayer.cpp
index 64436d768..64436d768 100644
--- a/tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp
+++ b/tests/auto/unit/multimedia/qmediaplayer/tst_qmediaplayer.cpp
diff --git a/tests/auto/unit/qmediaplaylist/CMakeLists.txt b/tests/auto/unit/multimedia/qmediaplaylist/CMakeLists.txt
index 5213163d8..a3b6e4b08 100644
--- a/tests/auto/unit/qmediaplaylist/CMakeLists.txt
+++ b/tests/auto/unit/multimedia/qmediaplaylist/CMakeLists.txt
@@ -13,8 +13,6 @@ list(APPEND test_data ${test_data_glob})
 qt_add_test(tst_qmediaplaylist
     SOURCES
         tst_qmediaplaylist.cpp
-    INCLUDE_DIRECTORIES
-        ../../../../src/plugins/m3u
     PUBLIC_LIBRARIES
         Qt::Gui
         Qt::MultimediaPrivate
diff --git a/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro b/tests/auto/unit/multimedia/qmediaplaylist/qmediaplaylist.pro
index 663d8d92f..b0ea77434 100644
--- a/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro
+++ b/tests/auto/unit/multimedia/qmediaplaylist/qmediaplaylist.pro
@@ -6,6 +6,4 @@ QT += multimedia-private testlib
 SOURCES += \
     tst_qmediaplaylist.cpp
 
-INCLUDEPATH += ../../../../src/plugins/m3u
-
 TESTDATA += testdata/*
diff --git a/tests/auto/unit/qmediaplaylist/testdata/empty.pls b/tests/auto/unit/multimedia/qmediaplaylist/testdata/empty.pls
index 639c22b0c..639c22b0c 100644
--- a/tests/auto/unit/qmediaplaylist/testdata/empty.pls
+++ b/tests/auto/unit/multimedia/qmediaplaylist/testdata/empty.pls
diff --git a/tests/auto/unit/qmediaplaylist/testdata/test.m3u b/tests/auto/unit/multimedia/qmediaplaylist/testdata/test.m3u
index e5cb7c828..e5cb7c828 100644
--- a/tests/auto/unit/qmediaplaylist/testdata/test.m3u
+++ b/tests/auto/unit/multimedia/qmediaplaylist/testdata/test.m3u
diff --git a/tests/auto/unit/qmediaplaylist/testdata/test.pls b/tests/auto/unit/multimedia/qmediaplaylist/testdata/test.pls
index 18832b101..18832b101 100644
--- a/tests/auto/unit/qmediaplaylist/testdata/test.pls
+++ b/tests/auto/unit/multimedia/qmediaplaylist/testdata/test.pls
diff --git a/tests/auto/unit/qmediaplaylist/testdata/testfile b/tests/auto/unit/multimedia/qmediaplaylist/testdata/testfile
index e69de29bb..e69de29bb 100644
--- a/tests/auto/unit/qmediaplaylist/testdata/testfile
+++ b/tests/auto/unit/multimedia/qmediaplaylist/testdata/testfile
diff --git a/tests/auto/unit/qmediaplaylist/testdata/testfile2#suffix b/tests/auto/unit/multimedia/qmediaplaylist/testdata/testfile2#suffix
index e69de29bb..e69de29bb 100644
--- a/tests/auto/unit/qmediaplaylist/testdata/testfile2#suffix
+++ b/tests/auto/unit/multimedia/qmediaplaylist/testdata/testfile2#suffix
diff --git a/tests/auto/unit/qmediaplaylist/testdata/totem-pl-example.pls b/tests/auto/unit/multimedia/qmediaplaylist/testdata/totem-pl-example.pls
index 385fe2a30..385fe2a30 100644
--- a/tests/auto/unit/qmediaplaylist/testdata/totem-pl-example.pls
+++ b/tests/auto/unit/multimedia/qmediaplaylist/testdata/totem-pl-example.pls
diff --git a/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp b/tests/auto/unit/multimedia/qmediaplaylist/tst_qmediaplaylist.cpp
index e1f25446e..e1f25446e 100644
--- a/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp
+++ b/tests/auto/unit/multimedia/qmediaplaylist/tst_qmediaplaylist.cpp
diff --git a/tests/auto/unit/qmediapluginloader/CMakeLists.txt b/tests/auto/unit/multimedia/qmediapluginloader/CMakeLists.txt
index a3f5ab2f3..a3f5ab2f3 100644
--- a/tests/auto/unit/qmediapluginloader/CMakeLists.txt
+++ b/tests/auto/unit/multimedia/qmediapluginloader/CMakeLists.txt
diff --git a/tests/auto/unit/qmediapluginloader/qmediapluginloader.pro b/tests/auto/unit/multimedia/qmediapluginloader/qmediapluginloader.pro
index 90b02ac59..90b02ac59 100644
--- a/tests/auto/unit/qmediapluginloader/qmediapluginloader.pro
+++ b/tests/auto/unit/multimedia/qmediapluginloader/qmediapluginloader.pro
diff --git a/tests/auto/unit/qmediapluginloader/tst_qmediapluginloader.cpp b/tests/auto/unit/multimedia/qmediapluginloader/tst_qmediapluginloader.cpp
index a07370921..a07370921 100644
--- a/tests/auto/unit/qmediapluginloader/tst_qmediapluginloader.cpp
+++ b/tests/auto/unit/multimedia/qmediapluginloader/tst_qmediapluginloader.cpp
diff --git a/tests/auto/unit/multimedia/qmediarecorder/CMakeLists.txt b/tests/auto/unit/multimedia/qmediarecorder/CMakeLists.txt
new file mode 100644
index 000000000..96a83bf86
--- /dev/null
+++ b/tests/auto/unit/multimedia/qmediarecorder/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qmediarecorder.pro.
+
+#####################################################################
+## tst_qmediarecorder Test:
+#####################################################################
+
+qt_add_test(tst_qmediarecorder
+    SOURCES
+        tst_qmediarecorder.cpp
+    INCLUDE_DIRECTORIES
+        ../../mockbackend
+    PUBLIC_LIBRARIES
+        # Remove: L${CMAKE_CURRENT_SOURCE_DIR}
+        Qt::Gui
+        Qt::MultimediaPrivate
+        QtMultimediaMockBackend
+)
diff --git a/tests/auto/unit/qmediarecorder/qmediarecorder.pro b/tests/auto/unit/multimedia/qmediarecorder/qmediarecorder.pro
index 7103ea157..e1523d3bf 100644
--- a/tests/auto/unit/qmediarecorder/qmediarecorder.pro
+++ b/tests/auto/unit/multimedia/qmediarecorder/qmediarecorder.pro
@@ -3,5 +3,4 @@ TARGET = tst_qmediarecorder
 QT += multimedia-private testlib
 SOURCES += tst_qmediarecorder.cpp
 
-include (../qmultimedia_common/mock.pri)
-include (../qmultimedia_common/mockrecorder.pri)
+include (../../mockbackend/mockbackend.pri)
diff --git a/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp b/tests/auto/unit/multimedia/qmediarecorder/tst_qmediarecorder.cpp
index 1e2173cd6..1e2173cd6 100644
--- a/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp
+++ b/tests/auto/unit/multimedia/qmediarecorder/tst_qmediarecorder.cpp
diff --git a/tests/auto/unit/qmediaservice/CMakeLists.txt b/tests/auto/unit/multimedia/qmediaservice/CMakeLists.txt
index a227f1ca4..a227f1ca4 100644
--- a/tests/auto/unit/qmediaservice/CMakeLists.txt
+++ b/tests/auto/unit/multimedia/qmediaservice/CMakeLists.txt
diff --git a/tests/auto/unit/qmediaservice/qmediaservice.pro b/tests/auto/unit/multimedia/qmediaservice/qmediaservice.pro
index b95554807..b95554807 100644
--- a/tests/auto/unit/qmediaservice/qmediaservice.pro
+++ b/tests/auto/unit/multimedia/qmediaservice/qmediaservice.pro
diff --git a/tests/auto/unit/qmediaservice/tst_qmediaservice.cpp b/tests/auto/unit/multimedia/qmediaservice/tst_qmediaservice.cpp
index 574b1f327..574b1f327 100644
--- a/tests/auto/unit/qmediaservice/tst_qmediaservice.cpp
+++ b/tests/auto/unit/multimedia/qmediaservice/tst_qmediaservice.cpp
diff --git a/tests/auto/unit/multimedia/qmediasink/CMakeLists.txt b/tests/auto/unit/multimedia/qmediasink/CMakeLists.txt
new file mode 100644
index 000000000..5ed35ac3c
--- /dev/null
+++ b/tests/auto/unit/multimedia/qmediasink/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qmediasink.pro.
+
+#####################################################################
+## tst_qmediasink Test:
+#####################################################################
+
+qt_add_test(tst_qmediasink
+    SOURCES
+        tst_qmediasink.cpp
+    INCLUDE_DIRECTORIES
+        ../../mockbackend
+    PUBLIC_LIBRARIES
+        # Remove: L${CMAKE_CURRENT_SOURCE_DIR}
+        Qt::Gui
+        Qt::MultimediaPrivate
+        QtMultimediaMockBackend
+)
diff --git a/tests/auto/unit/qmediasink/qmediasink.pro b/tests/auto/unit/multimedia/qmediasink/qmediasink.pro
index 0a34e0f0a..51743bdbe 100644
--- a/tests/auto/unit/qmediasink/qmediasink.pro
+++ b/tests/auto/unit/multimedia/qmediasink/qmediasink.pro
@@ -6,5 +6,4 @@ QT += multimedia-private testlib
 SOURCES += \
     tst_qmediasink.cpp
 
-include (../qmultimedia_common/mock.pri)
-include (../qmultimedia_common/mockrecorder.pri)
+include (../../mockbackend/mockbackend.pri)
diff --git a/tests/auto/unit/qmediasink/tst_qmediasink.cpp b/tests/auto/unit/multimedia/qmediasink/tst_qmediasink.cpp
index ea99964da..ea99964da 100644
--- a/tests/auto/unit/qmediasink/tst_qmediasink.cpp
+++ b/tests/auto/unit/multimedia/qmediasink/tst_qmediasink.cpp
diff --git a/tests/auto/unit/multimedia/qmediasource/CMakeLists.txt b/tests/auto/unit/multimedia/qmediasource/CMakeLists.txt
new file mode 100644
index 000000000..a281449e0
--- /dev/null
+++ b/tests/auto/unit/multimedia/qmediasource/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qmediasource.pro.
+
+#####################################################################
+## tst_qmediasource Test:
+#####################################################################
+
+qt_add_test(tst_qmediasource
+    SOURCES
+        tst_qmediasource.cpp
+    INCLUDE_DIRECTORIES
+        ../../mockbackend
+    PUBLIC_LIBRARIES
+        # Remove: L${CMAKE_CURRENT_SOURCE_DIR}
+        Qt::Gui
+        Qt::MultimediaPrivate
+        QtMultimediaMockBackend
+)
diff --git a/tests/auto/unit/qmediasource/qmediasource.pro b/tests/auto/unit/multimedia/qmediasource/qmediasource.pro
index 475d81f19..5bc4a884f 100644
--- a/tests/auto/unit/qmediasource/qmediasource.pro
+++ b/tests/auto/unit/multimedia/qmediasource/qmediasource.pro
@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qmediasource
 QT += multimedia-private testlib
 
-include (../qmultimedia_common/mockrecorder.pri)
-include (../qmultimedia_common/mock.pri)
+include (../../mockbackend/mockbackend.pri)
 
 SOURCES += tst_qmediasource.cpp
diff --git a/tests/auto/unit/qmediasource/tst_qmediasource.cpp b/tests/auto/unit/multimedia/qmediasource/tst_qmediasource.cpp
index 905c0f1ac..905c0f1ac 100644
--- a/tests/auto/unit/qmediasource/tst_qmediasource.cpp
+++ b/tests/auto/unit/multimedia/qmediasource/tst_qmediasource.cpp
diff --git a/tests/auto/unit/qmediatimerange/CMakeLists.txt b/tests/auto/unit/multimedia/qmediatimerange/CMakeLists.txt
index f8efaba73..f8efaba73 100644
--- a/tests/auto/unit/qmediatimerange/CMakeLists.txt
+++ b/tests/auto/unit/multimedia/qmediatimerange/CMakeLists.txt
diff --git a/tests/auto/unit/qmediatimerange/qmediatimerange.pro b/tests/auto/unit/multimedia/qmediatimerange/qmediatimerange.pro
index c59c3d8df..c59c3d8df 100644
--- a/tests/auto/unit/qmediatimerange/qmediatimerange.pro
+++ b/tests/auto/unit/multimedia/qmediatimerange/qmediatimerange.pro
diff --git a/tests/auto/unit/qmediatimerange/tst_qmediatimerange.cpp b/tests/auto/unit/multimedia/qmediatimerange/tst_qmediatimerange.cpp
index 439ff8f4d..439ff8f4d 100644
--- a/tests/auto/unit/qmediatimerange/tst_qmediatimerange.cpp
+++ b/tests/auto/unit/multimedia/qmediatimerange/tst_qmediatimerange.cpp
diff --git a/tests/auto/unit/qmetadatareadercontrol/CMakeLists.txt b/tests/auto/unit/multimedia/qmetadatareadercontrol/CMakeLists.txt
index 35c277ae4..6da45c630 100644
--- a/tests/auto/unit/qmetadatareadercontrol/CMakeLists.txt
+++ b/tests/auto/unit/multimedia/qmetadatareadercontrol/CMakeLists.txt
@@ -6,14 +6,12 @@
 
 qt_add_test(tst_qmetadatareadercontrol
     SOURCES
-        ../qmultimedia_common/mockmediacontainercontrol.h
-        ../qmultimedia_common/mockmetadatareadercontrol.h
-        ../qmultimedia_common/mockmetadatawritercontrol.h
         tst_qmetadatareadercontrol.cpp
     INCLUDE_DIRECTORIES
-        ../../../src/multimedia
-        ../qmultimedia_common
+        ../../mockbackend
     PUBLIC_LIBRARIES
+        # Remove: L${CMAKE_CURRENT_SOURCE_DIR}
         Qt::Gui
         Qt::MultimediaPrivate
+        QtMultimediaMockBackend
 )
diff --git a/tests/auto/unit/qmetadatareadercontrol/qmetadatareadercontrol.pro b/tests/auto/unit/multimedia/qmetadatareadercontrol/qmetadatareadercontrol.pro
index 1ed2b3443..a8aec770d 100644
--- a/tests/auto/unit/qmetadatareadercontrol/qmetadatareadercontrol.pro
+++ b/tests/auto/unit/multimedia/qmetadatareadercontrol/qmetadatareadercontrol.pro
@@ -5,5 +5,5 @@ QT += multimedia-private testlib
 
 SOURCES += tst_qmetadatareadercontrol.cpp
 
-include (../qmultimedia_common/mockcontainer.pri)
+include (../../mockbackend/mockbackend.pri)
 
diff --git a/tests/auto/unit/qmetadatareadercontrol/tst_qmetadatareadercontrol.cpp b/tests/auto/unit/multimedia/qmetadatareadercontrol/tst_qmetadatareadercontrol.cpp
index 3e14dc3c7..3e14dc3c7 100644
--- a/tests/auto/unit/qmetadatareadercontrol/tst_qmetadatareadercontrol.cpp
+++ b/tests/auto/unit/multimedia/qmetadatareadercontrol/tst_qmetadatareadercontrol.cpp
diff --git a/tests/auto/unit/qmetadatawritercontrol/CMakeLists.txt b/tests/auto/unit/multimedia/qmetadatawritercontrol/CMakeLists.txt
index 7f8588efb..b2cbf18a9 100644
--- a/tests/auto/unit/qmetadatawritercontrol/CMakeLists.txt
+++ b/tests/auto/unit/multimedia/qmetadatawritercontrol/CMakeLists.txt
@@ -6,14 +6,12 @@
 
 qt_add_test(tst_qmetadatawritercontrol
     SOURCES
-        ../qmultimedia_common/mockmediacontainercontrol.h
-        ../qmultimedia_common/mockmetadatareadercontrol.h
-        ../qmultimedia_common/mockmetadatawritercontrol.h
         tst_qmetadatawritercontrol.cpp
     INCLUDE_DIRECTORIES
-        ../../../src/multimedia
-        ../qmultimedia_common
+        ../../mockbackend
     PUBLIC_LIBRARIES
+        # Remove: L${CMAKE_CURRENT_SOURCE_DIR}
         Qt::Gui
         Qt::MultimediaPrivate
+        QtMultimediaMockBackend
 )
diff --git a/tests/auto/unit/qmetadatawritercontrol/qmetadatawritercontrol.pro b/tests/auto/unit/multimedia/qmetadatawritercontrol/qmetadatawritercontrol.pro
index db7e964ba..68fe77c95 100644
--- a/tests/auto/unit/qmetadatawritercontrol/qmetadatawritercontrol.pro
+++ b/tests/auto/unit/multimedia/qmetadatawritercontrol/qmetadatawritercontrol.pro
@@ -5,4 +5,4 @@ QT += multimedia-private testlib
 
 SOURCES += tst_qmetadatawritercontrol.cpp
 
-include (../qmultimedia_common/mockcontainer.pri)
+include (../../mockbackend/mockbackend.pri)
diff --git a/tests/auto/unit/qmetadatawritercontrol/tst_qmetadatawritercontrol.cpp b/tests/auto/unit/multimedia/qmetadatawritercontrol/tst_qmetadatawritercontrol.cpp
index f8ceb694c..f8ceb694c 100644
--- a/tests/auto/unit/qmetadatawritercontrol/tst_qmetadatawritercontrol.cpp
+++ b/tests/auto/unit/multimedia/qmetadatawritercontrol/tst_qmetadatawritercontrol.cpp
diff --git a/tests/auto/unit/qsamplecache/CMakeLists.txt b/tests/auto/unit/multimedia/qsamplecache/CMakeLists.txt
index 1df23c428..1df23c428 100644
--- a/tests/auto/unit/qsamplecache/CMakeLists.txt
+++ b/tests/auto/unit/multimedia/qsamplecache/CMakeLists.txt
diff --git a/tests/auto/unit/qsamplecache/qsamplecache.pro b/tests/auto/unit/multimedia/qsamplecache/qsamplecache.pro
index 02ca7cb18..02ca7cb18 100644
--- a/tests/auto/unit/qsamplecache/qsamplecache.pro
+++ b/tests/auto/unit/multimedia/qsamplecache/qsamplecache.pro
diff --git a/tests/auto/unit/qsamplecache/testdata/test.wav b/tests/auto/unit/multimedia/qsamplecache/testdata/test.wav
index 4dd022661..4dd022661 100644
--- a/tests/auto/unit/qsamplecache/testdata/test.wav
+++ b/tests/auto/unit/multimedia/qsamplecache/testdata/test.wav
diff --git a/tests/auto/unit/qsamplecache/testdata/test2.wav b/tests/auto/unit/multimedia/qsamplecache/testdata/test2.wav
index 4dd022661..4dd022661 100644
--- a/tests/auto/unit/qsamplecache/testdata/test2.wav
+++ b/tests/auto/unit/multimedia/qsamplecache/testdata/test2.wav
diff --git a/tests/auto/unit/qsamplecache/tst_qsamplecache.cpp b/tests/auto/unit/multimedia/qsamplecache/tst_qsamplecache.cpp
index bae68a9d5..bae68a9d5 100644
--- a/tests/auto/unit/qsamplecache/tst_qsamplecache.cpp
+++ b/tests/auto/unit/multimedia/qsamplecache/tst_qsamplecache.cpp
diff --git a/tests/auto/unit/qvideoencodersettingscontrol/CMakeLists.txt b/tests/auto/unit/multimedia/qvideoencodersettingscontrol/CMakeLists.txt
index dce65b023..dce65b023 100644
--- a/tests/auto/unit/qvideoencodersettingscontrol/CMakeLists.txt
+++ b/tests/auto/unit/multimedia/qvideoencodersettingscontrol/CMakeLists.txt
diff --git a/tests/auto/unit/qvideoencodersettingscontrol/qvideoencodersettingscontrol.pro b/tests/auto/unit/multimedia/qvideoencodersettingscontrol/qvideoencodersettingscontrol.pro
index 7b7ef7679..7b7ef7679 100644
--- a/tests/auto/unit/qvideoencodersettingscontrol/qvideoencodersettingscontrol.pro
+++ b/tests/auto/unit/multimedia/qvideoencodersettingscontrol/qvideoencodersettingscontrol.pro
diff --git a/tests/auto/unit/qvideoencodersettingscontrol/tst_qvideoencodersettingscontrol.cpp b/tests/auto/unit/multimedia/qvideoencodersettingscontrol/tst_qvideoencodersettingscontrol.cpp
index 03fd1d990..03fd1d990 100644
--- a/tests/auto/unit/qvideoencodersettingscontrol/tst_qvideoencodersettingscontrol.cpp
+++ b/tests/auto/unit/multimedia/qvideoencodersettingscontrol/tst_qvideoencodersettingscontrol.cpp
diff --git a/tests/auto/unit/qvideoframe/CMakeLists.txt b/tests/auto/unit/multimedia/qvideoframe/CMakeLists.txt
index e168622c1..e168622c1 100644
--- a/tests/auto/unit/qvideoframe/CMakeLists.txt
+++ b/tests/auto/unit/multimedia/qvideoframe/CMakeLists.txt
diff --git a/tests/auto/unit/qvideoframe/qvideoframe.pro b/tests/auto/unit/multimedia/qvideoframe/qvideoframe.pro
index 2d7bc0360..2d7bc0360 100644
--- a/tests/auto/unit/qvideoframe/qvideoframe.pro
+++ b/tests/auto/unit/multimedia/qvideoframe/qvideoframe.pro
diff --git a/tests/auto/unit/qvideoframe/tst_qvideoframe.cpp b/tests/auto/unit/multimedia/qvideoframe/tst_qvideoframe.cpp
index 1eac0bed2..1eac0bed2 100644
--- a/tests/auto/unit/qvideoframe/tst_qvideoframe.cpp
+++ b/tests/auto/unit/multimedia/qvideoframe/tst_qvideoframe.cpp
diff --git a/tests/auto/unit/multimedia/qvideoprobe/CMakeLists.txt b/tests/auto/unit/multimedia/qvideoprobe/CMakeLists.txt
new file mode 100644
index 000000000..ca29981fa
--- /dev/null
+++ b/tests/auto/unit/multimedia/qvideoprobe/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qvideoprobe.pro.
+
+#####################################################################
+## tst_qvideoprobe Test:
+#####################################################################
+
+qt_add_test(tst_qvideoprobe
+    SOURCES
+        tst_qvideoprobe.cpp
+    INCLUDE_DIRECTORIES
+        ../../mockbackend
+    PUBLIC_LIBRARIES
+        # Remove: L${CMAKE_CURRENT_SOURCE_DIR}
+        Qt::Gui
+        Qt::MultimediaPrivate
+        QtMultimediaMockBackend
+)
diff --git a/tests/auto/unit/multimedia/qvideoprobe/qvideoprobe.pro b/tests/auto/unit/multimedia/qvideoprobe/qvideoprobe.pro
new file mode 100644
index 000000000..1edc20492
--- /dev/null
+++ b/tests/auto/unit/multimedia/qvideoprobe/qvideoprobe.pro
@@ -0,0 +1,8 @@
+CONFIG += testcase
+TARGET = tst_qvideoprobe
+
+QT += multimedia-private testlib
+
+SOURCES += tst_qvideoprobe.cpp
+
+include (../../mockbackend/mockbackend.pri)
diff --git a/tests/auto/unit/qvideoprobe/tst_qvideoprobe.cpp b/tests/auto/unit/multimedia/qvideoprobe/tst_qvideoprobe.cpp
index 55e073acd..55e073acd 100644
--- a/tests/auto/unit/qvideoprobe/tst_qvideoprobe.cpp
+++ b/tests/auto/unit/multimedia/qvideoprobe/tst_qvideoprobe.cpp
diff --git a/tests/auto/unit/qvideosurfaceformat/CMakeLists.txt b/tests/auto/unit/multimedia/qvideosurfaceformat/CMakeLists.txt
index f586f7634..f586f7634 100644
--- a/tests/auto/unit/qvideosurfaceformat/CMakeLists.txt
+++ b/tests/auto/unit/multimedia/qvideosurfaceformat/CMakeLists.txt
diff --git a/tests/auto/unit/qvideosurfaceformat/qvideosurfaceformat.pro b/tests/auto/unit/multimedia/qvideosurfaceformat/qvideosurfaceformat.pro
index 28cd0ad55..28cd0ad55 100644
--- a/tests/auto/unit/qvideosurfaceformat/qvideosurfaceformat.pro
+++ b/tests/auto/unit/multimedia/qvideosurfaceformat/qvideosurfaceformat.pro
diff --git a/tests/auto/unit/qvideosurfaceformat/tst_qvideosurfaceformat.cpp b/tests/auto/unit/multimedia/qvideosurfaceformat/tst_qvideosurfaceformat.cpp
index e3a9b3822..e3a9b3822 100644
--- a/tests/auto/unit/qvideosurfaceformat/tst_qvideosurfaceformat.cpp
+++ b/tests/auto/unit/multimedia/qvideosurfaceformat/tst_qvideosurfaceformat.cpp
diff --git a/tests/auto/unit/qwavedecoder/CMakeLists.txt b/tests/auto/unit/multimedia/qwavedecoder/CMakeLists.txt
index e4bf7aec0..44af2b109 100644
--- a/tests/auto/unit/qwavedecoder/CMakeLists.txt
+++ b/tests/auto/unit/multimedia/qwavedecoder/CMakeLists.txt
@@ -12,7 +12,6 @@ list(APPEND test_data ${test_data_glob})
 
 qt_add_test(tst_qwavedecoder
     SOURCES
-        ../../../../src/multimedia/audio/qwavedecoder_p.cpp ../../../../src/multimedia/audio/qwavedecoder_p.h
         tst_qwavedecoder.cpp
     PUBLIC_LIBRARIES
         Qt::Gui
diff --git a/tests/auto/unit/qwavedecoder/data/corrupt_datadesc_1_16_8000.le.wav b/tests/auto/unit/multimedia/qwavedecoder/data/corrupt_datadesc_1_16_8000.le.wav
index b6eac4d70..b6eac4d70 100644
--- a/tests/auto/unit/qwavedecoder/data/corrupt_datadesc_1_16_8000.le.wav
+++ b/tests/auto/unit/multimedia/qwavedecoder/data/corrupt_datadesc_1_16_8000.le.wav
diff --git a/tests/auto/unit/qwavedecoder/data/corrupt_fmtdesc_1_16_8000.le.wav b/tests/auto/unit/multimedia/qwavedecoder/data/corrupt_fmtdesc_1_16_8000.le.wav
index 2f0da1370..2f0da1370 100644
--- a/tests/auto/unit/qwavedecoder/data/corrupt_fmtdesc_1_16_8000.le.wav
+++ b/tests/auto/unit/multimedia/qwavedecoder/data/corrupt_fmtdesc_1_16_8000.le.wav
diff --git a/tests/auto/unit/qwavedecoder/data/corrupt_fmtstring_1_16_8000.le.wav b/tests/auto/unit/multimedia/qwavedecoder/data/corrupt_fmtstring_1_16_8000.le.wav
index b14a53c9e..b14a53c9e 100644
--- a/tests/auto/unit/qwavedecoder/data/corrupt_fmtstring_1_16_8000.le.wav
+++ b/tests/auto/unit/multimedia/qwavedecoder/data/corrupt_fmtstring_1_16_8000.le.wav
diff --git a/tests/auto/unit/qwavedecoder/data/empty.wav b/tests/auto/unit/multimedia/qwavedecoder/data/empty.wav
index e69de29bb..e69de29bb 100644
--- a/tests/auto/unit/qwavedecoder/data/empty.wav
+++ b/tests/auto/unit/multimedia/qwavedecoder/data/empty.wav
diff --git a/tests/auto/unit/qwavedecoder/data/gendata.sh b/tests/auto/unit/multimedia/qwavedecoder/data/gendata.sh
index c799e6f9f..c799e6f9f 100755
--- a/tests/auto/unit/qwavedecoder/data/gendata.sh
+++ b/tests/auto/unit/multimedia/qwavedecoder/data/gendata.sh
diff --git a/tests/auto/unit/qwavedecoder/data/isawav_1_16_44100_le.wav b/tests/auto/unit/multimedia/qwavedecoder/data/isawav_1_16_44100_le.wav
index 88b1a8379..88b1a8379 100644
--- a/tests/auto/unit/qwavedecoder/data/isawav_1_16_44100_le.wav
+++ b/tests/auto/unit/multimedia/qwavedecoder/data/isawav_1_16_44100_le.wav
diff --git a/tests/auto/unit/qwavedecoder/data/isawav_1_16_44100_le_2.wav b/tests/auto/unit/multimedia/qwavedecoder/data/isawav_1_16_44100_le_2.wav
index 087e68e82..087e68e82 100644
--- a/tests/auto/unit/qwavedecoder/data/isawav_1_16_44100_le_2.wav
+++ b/tests/auto/unit/multimedia/qwavedecoder/data/isawav_1_16_44100_le_2.wav
diff --git a/tests/auto/unit/qwavedecoder/data/isawav_1_16_8000_le.wav b/tests/auto/unit/multimedia/qwavedecoder/data/isawav_1_16_8000_le.wav
index 83a405907..83a405907 100644
--- a/tests/auto/unit/qwavedecoder/data/isawav_1_16_8000_le.wav
+++ b/tests/auto/unit/multimedia/qwavedecoder/data/isawav_1_16_8000_le.wav
diff --git a/tests/auto/unit/qwavedecoder/data/isawav_1_32_44100_le.wav b/tests/auto/unit/multimedia/qwavedecoder/data/isawav_1_32_44100_le.wav
index 9c437b155..9c437b155 100644
--- a/tests/auto/unit/qwavedecoder/data/isawav_1_32_44100_le.wav
+++ b/tests/auto/unit/multimedia/qwavedecoder/data/isawav_1_32_44100_le.wav
diff --git a/tests/auto/unit/qwavedecoder/data/isawav_1_32_8000_le.wav b/tests/auto/unit/multimedia/qwavedecoder/data/isawav_1_32_8000_le.wav
index f90a8bc35..f90a8bc35 100644
--- a/tests/auto/unit/qwavedecoder/data/isawav_1_32_8000_le.wav
+++ b/tests/auto/unit/multimedia/qwavedecoder/data/isawav_1_32_8000_le.wav
diff --git a/tests/auto/unit/qwavedecoder/data/isawav_1_8_44100.wav b/tests/auto/unit/multimedia/qwavedecoder/data/isawav_1_8_44100.wav
index 7d10829ea..7d10829ea 100644
--- a/tests/auto/unit/qwavedecoder/data/isawav_1_8_44100.wav
+++ b/tests/auto/unit/multimedia/qwavedecoder/data/isawav_1_8_44100.wav
diff --git a/tests/auto/unit/qwavedecoder/data/isawav_1_8_8000.wav b/tests/auto/unit/multimedia/qwavedecoder/data/isawav_1_8_8000.wav
index 76c08e89e..76c08e89e 100644
--- a/tests/auto/unit/qwavedecoder/data/isawav_1_8_8000.wav
+++ b/tests/auto/unit/multimedia/qwavedecoder/data/isawav_1_8_8000.wav
diff --git a/tests/auto/unit/qwavedecoder/data/isawav_2_16_44100_be.wav b/tests/auto/unit/multimedia/qwavedecoder/data/isawav_2_16_44100_be.wav
index ca0cd425a..ca0cd425a 100644
--- a/tests/auto/unit/qwavedecoder/data/isawav_2_16_44100_be.wav
+++ b/tests/auto/unit/multimedia/qwavedecoder/data/isawav_2_16_44100_be.wav
diff --git a/tests/auto/unit/qwavedecoder/data/isawav_2_16_8000_be.wav b/tests/auto/unit/multimedia/qwavedecoder/data/isawav_2_16_8000_be.wav
index 3a684590b..3a684590b 100644
--- a/tests/auto/unit/qwavedecoder/data/isawav_2_16_8000_be.wav
+++ b/tests/auto/unit/multimedia/qwavedecoder/data/isawav_2_16_8000_be.wav
diff --git a/tests/auto/unit/qwavedecoder/data/isawav_2_32_44100_be.wav b/tests/auto/unit/multimedia/qwavedecoder/data/isawav_2_32_44100_be.wav
index f1aaf2906..f1aaf2906 100644
--- a/tests/auto/unit/qwavedecoder/data/isawav_2_32_44100_be.wav
+++ b/tests/auto/unit/multimedia/qwavedecoder/data/isawav_2_32_44100_be.wav
diff --git a/tests/auto/unit/qwavedecoder/data/isawav_2_32_8000_be.wav b/tests/auto/unit/multimedia/qwavedecoder/data/isawav_2_32_8000_be.wav
index c10c20872..c10c20872 100644
--- a/tests/auto/unit/qwavedecoder/data/isawav_2_32_8000_be.wav
+++ b/tests/auto/unit/multimedia/qwavedecoder/data/isawav_2_32_8000_be.wav
diff --git a/tests/auto/unit/qwavedecoder/data/isawav_2_8_44100.wav b/tests/auto/unit/multimedia/qwavedecoder/data/isawav_2_8_44100.wav
index befd02baf..befd02baf 100644
--- a/tests/auto/unit/qwavedecoder/data/isawav_2_8_44100.wav
+++ b/tests/auto/unit/multimedia/qwavedecoder/data/isawav_2_8_44100.wav
diff --git a/tests/auto/unit/qwavedecoder/data/isawav_2_8_8000.wav b/tests/auto/unit/multimedia/qwavedecoder/data/isawav_2_8_8000.wav
index ce8b0d06a..ce8b0d06a 100644
--- a/tests/auto/unit/qwavedecoder/data/isawav_2_8_8000.wav
+++ b/tests/auto/unit/multimedia/qwavedecoder/data/isawav_2_8_8000.wav
diff --git a/tests/auto/unit/qwavedecoder/data/nosampledata.wav b/tests/auto/unit/multimedia/qwavedecoder/data/nosampledata.wav
index 8dbde9545..8dbde9545 100644
--- a/tests/auto/unit/qwavedecoder/data/nosampledata.wav
+++ b/tests/auto/unit/multimedia/qwavedecoder/data/nosampledata.wav
diff --git a/tests/auto/unit/qwavedecoder/data/notawav.wav b/tests/auto/unit/multimedia/qwavedecoder/data/notawav.wav
index 36a20ea05..36a20ea05 100644
--- a/tests/auto/unit/qwavedecoder/data/notawav.wav
+++ b/tests/auto/unit/multimedia/qwavedecoder/data/notawav.wav
diff --git a/tests/auto/unit/qwavedecoder/data/onebyte.wav b/tests/auto/unit/multimedia/qwavedecoder/data/onebyte.wav
index d00491fd7..d00491fd7 100644
--- a/tests/auto/unit/qwavedecoder/data/onebyte.wav
+++ b/tests/auto/unit/multimedia/qwavedecoder/data/onebyte.wav
diff --git a/tests/auto/unit/qwavedecoder/qwavedecoder.pro b/tests/auto/unit/multimedia/qwavedecoder/qwavedecoder.pro
index 1409df98b..672cf3a03 100644
--- a/tests/auto/unit/qwavedecoder/qwavedecoder.pro
+++ b/tests/auto/unit/multimedia/qwavedecoder/qwavedecoder.pro
@@ -1,7 +1,5 @@
 TARGET = tst_qwavedecoder
-HEADERS += ../../../../src/multimedia/audio/qwavedecoder_p.h
 SOURCES += tst_qwavedecoder.cpp \
-           ../../../../src/multimedia/audio/qwavedecoder_p.cpp
 
 QT += multimedia-private testlib network
 CONFIG += testcase
diff --git a/tests/auto/unit/qwavedecoder/tst_qwavedecoder.cpp b/tests/auto/unit/multimedia/qwavedecoder/tst_qwavedecoder.cpp
index 274450602..274450602 100644
--- a/tests/auto/unit/qwavedecoder/tst_qwavedecoder.cpp
+++ b/tests/auto/unit/multimedia/qwavedecoder/tst_qwavedecoder.cpp
diff --git a/tests/auto/unit/multimediawidgets/CMakeLists.txt b/tests/auto/unit/multimediawidgets/CMakeLists.txt
new file mode 100644
index 000000000..f7d83da3b
--- /dev/null
+++ b/tests/auto/unit/multimediawidgets/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Generated from multimediawidgets.pro.
+
+add_subdirectory(qcamerawidgets)
+add_subdirectory(qmediaplayerwidgets)
+if(QT_FEATURE_private_tests)
+    add_subdirectory(qgraphicsvideoitem)
+    add_subdirectory(qpaintervideosurface)
+    add_subdirectory(qvideowidget)
+endif()
diff --git a/tests/auto/unit/multimediawidgets.pro b/tests/auto/unit/multimediawidgets/multimediawidgets.pro
index 44a160af6..44a160af6 100644
--- a/tests/auto/unit/multimediawidgets.pro
+++ b/tests/auto/unit/multimediawidgets/multimediawidgets.pro
diff --git a/tests/auto/unit/multimediawidgets/qcamerawidgets/CMakeLists.txt b/tests/auto/unit/multimediawidgets/qcamerawidgets/CMakeLists.txt
new file mode 100644
index 000000000..b3d8e3794
--- /dev/null
+++ b/tests/auto/unit/multimediawidgets/qcamerawidgets/CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from qcamerawidgets.pro.
+
+#####################################################################
+## tst_qcamerawidgets Test:
+#####################################################################
+
+qt_add_test(tst_qcamerawidgets
+    SOURCES
+        tst_qcamerawidgets.cpp
+    INCLUDE_DIRECTORIES
+        ../../mockbackend
+    PUBLIC_LIBRARIES
+        # Remove: L${CMAKE_CURRENT_SOURCE_DIR}
+        Qt::Gui
+        Qt::MultimediaPrivate
+        Qt::MultimediaWidgetsPrivate
+        Qt::Widgets
+        QtMultimediaMockBackend
+)
diff --git a/tests/auto/unit/qcamerawidgets/qcamerawidgets.pro b/tests/auto/unit/multimediawidgets/qcamerawidgets/qcamerawidgets.pro
index c87144e94..c9d92a040 100644
--- a/tests/auto/unit/qcamerawidgets/qcamerawidgets.pro
+++ b/tests/auto/unit/multimediawidgets/qcamerawidgets/qcamerawidgets.pro
@@ -3,8 +3,7 @@ TARGET = tst_qcamerawidgets
 
 QT += multimedia-private multimediawidgets-private testlib
 
-include (../qmultimedia_common/mock.pri)
-include (../qmultimedia_common/mockcamera.pri)
+include (../../mockbackend/mockbackend.pri)
 
 SOURCES += tst_qcamerawidgets.cpp
 
diff --git a/tests/auto/unit/qcamerawidgets/tst_qcamerawidgets.cpp b/tests/auto/unit/multimediawidgets/qcamerawidgets/tst_qcamerawidgets.cpp
index 5b5b47ac3..5b5b47ac3 100644
--- a/tests/auto/unit/qcamerawidgets/tst_qcamerawidgets.cpp
+++ b/tests/auto/unit/multimediawidgets/qcamerawidgets/tst_qcamerawidgets.cpp
diff --git a/tests/auto/unit/qgraphicsvideoitem/CMakeLists.txt b/tests/auto/unit/multimediawidgets/qgraphicsvideoitem/CMakeLists.txt
index a0f013c54..a0f013c54 100644
--- a/tests/auto/unit/qgraphicsvideoitem/CMakeLists.txt
+++ b/tests/auto/unit/multimediawidgets/qgraphicsvideoitem/CMakeLists.txt
diff --git a/tests/auto/unit/qgraphicsvideoitem/qgraphicsvideoitem.pro b/tests/auto/unit/multimediawidgets/qgraphicsvideoitem/qgraphicsvideoitem.pro
index 27d0ff9a4..27d0ff9a4 100644
--- a/tests/auto/unit/qgraphicsvideoitem/qgraphicsvideoitem.pro
+++ b/tests/auto/unit/multimediawidgets/qgraphicsvideoitem/qgraphicsvideoitem.pro
diff --git a/tests/auto/unit/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp b/tests/auto/unit/multimediawidgets/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp
index 48d821ab5..48d821ab5 100644
--- a/tests/auto/unit/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp
+++ b/tests/auto/unit/multimediawidgets/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp
diff --git a/tests/auto/unit/multimediawidgets/qmediaplayerwidgets/CMakeLists.txt b/tests/auto/unit/multimediawidgets/qmediaplayerwidgets/CMakeLists.txt
new file mode 100644
index 000000000..000dfa156
--- /dev/null
+++ b/tests/auto/unit/multimediawidgets/qmediaplayerwidgets/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from qmediaplayerwidgets.pro.
+
+#####################################################################
+## tst_qmediaplayerwidgets Test:
+#####################################################################
+
+qt_add_test(tst_qmediaplayerwidgets
+    SOURCES
+        tst_qmediaplayerwidgets.cpp
+    INCLUDE_DIRECTORIES
+        ../../mockbackend
+    PUBLIC_LIBRARIES
+        # Remove: L${CMAKE_CURRENT_SOURCE_DIR}
+        Qt::Gui
+        Qt::MultimediaPrivate
+        Qt::MultimediaWidgetsPrivate
+        Qt::Network
+        Qt::Widgets
+        QtMultimediaMockBackend
+)
diff --git a/tests/auto/unit/qmediaplayerwidgets/qmediaplayerwidgets.pro b/tests/auto/unit/multimediawidgets/qmediaplayerwidgets/qmediaplayerwidgets.pro
index 60c4f25f4..fd609105a 100644
--- a/tests/auto/unit/qmediaplayerwidgets/qmediaplayerwidgets.pro
+++ b/tests/auto/unit/multimediawidgets/qmediaplayerwidgets/qmediaplayerwidgets.pro
@@ -3,5 +3,4 @@ TARGET = tst_qmediaplayerwidgets
 QT += network multimedia-private multimediawidgets-private testlib widgets
 SOURCES += tst_qmediaplayerwidgets.cpp
 
-include (../qmultimedia_common/mock.pri)
-include (../qmultimedia_common/mockplayer.pri)
+include (../../mockbackend/mockbackend.pri)
diff --git a/tests/auto/unit/qmediaplayerwidgets/tst_qmediaplayerwidgets.cpp b/tests/auto/unit/multimediawidgets/qmediaplayerwidgets/tst_qmediaplayerwidgets.cpp
index bb58c1184..bb58c1184 100644
--- a/tests/auto/unit/qmediaplayerwidgets/tst_qmediaplayerwidgets.cpp
+++ b/tests/auto/unit/multimediawidgets/qmediaplayerwidgets/tst_qmediaplayerwidgets.cpp
diff --git a/tests/auto/unit/qpaintervideosurface/CMakeLists.txt b/tests/auto/unit/multimediawidgets/qpaintervideosurface/CMakeLists.txt
index 79c301ae0..b4831e35a 100644
--- a/tests/auto/unit/qpaintervideosurface/CMakeLists.txt
+++ b/tests/auto/unit/multimediawidgets/qpaintervideosurface/CMakeLists.txt
@@ -21,8 +21,3 @@ qt_extend_target(tst_qpaintervideosurface CONDITION TARGET Qt::OpenGL
     PUBLIC_LIBRARIES
         Qt::OpenGL
 )
-
-qt_extend_target(tst_qpaintervideosurface CONDITION linux-_x_ AND system(". /etc/lsb-release AND [ $DISTRIB_CODENAME = precise ]")
-    DEFINES
-        UBUNTU_PRECISE_PANGOLIN
-)
diff --git a/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro b/tests/auto/unit/multimediawidgets/qpaintervideosurface/qpaintervideosurface.pro
index f1db2c5fb..f0465706e 100644
--- a/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro
+++ b/tests/auto/unit/multimediawidgets/qpaintervideosurface/qpaintervideosurface.pro
@@ -9,5 +9,3 @@ qtHaveModule(opengl): \
 SOURCES += tst_qpaintervideosurface.cpp
 
 QT+=widgets
-
-linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = precise ]"):DEFINES+=UBUNTU_PRECISE_PANGOLIN
diff --git a/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp b/tests/auto/unit/multimediawidgets/qpaintervideosurface/tst_qpaintervideosurface.cpp
index 14f9309db..14f9309db 100644
--- a/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp
+++ b/tests/auto/unit/multimediawidgets/qpaintervideosurface/tst_qpaintervideosurface.cpp
diff --git a/tests/auto/unit/qvideowidget/CMakeLists.txt b/tests/auto/unit/multimediawidgets/qvideowidget/CMakeLists.txt
index df4d8e0cf..df4d8e0cf 100644
--- a/tests/auto/unit/qvideowidget/CMakeLists.txt
+++ b/tests/auto/unit/multimediawidgets/qvideowidget/CMakeLists.txt
diff --git a/tests/auto/unit/qvideowidget/qvideowidget.pro b/tests/auto/unit/multimediawidgets/qvideowidget/qvideowidget.pro
index e12e3a050..b729dbc23 100644
--- a/tests/auto/unit/qvideowidget/qvideowidget.pro
+++ b/tests/auto/unit/multimediawidgets/qvideowidget/qvideowidget.pro
@@ -1,8 +1,6 @@
 CONFIG += testcase
 TARGET = tst_qvideowidget
 
-QT += multimedia-private multimediawidgets-private testlib
+QT += multimedia-private multimediawidgets-private testlib widgets
 
 SOURCES += tst_qvideowidget.cpp
-
-QT+=widgets
diff --git a/tests/auto/unit/qvideowidget/tst_qvideowidget.cpp b/tests/auto/unit/multimediawidgets/qvideowidget/tst_qvideowidget.cpp
index 6863949df..6863949df 100644
--- a/tests/auto/unit/qvideowidget/tst_qvideowidget.cpp
+++ b/tests/auto/unit/multimediawidgets/qvideowidget/tst_qvideowidget.cpp
diff --git a/tests/auto/unit/qaudiodecoder/CMakeLists.txt b/tests/auto/unit/qaudiodecoder/CMakeLists.txt
deleted file mode 100644
index 39e938082..000000000
--- a/tests/auto/unit/qaudiodecoder/CMakeLists.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-# Generated from qaudiodecoder.pro.
-
-#####################################################################
-## tst_qaudiodecoder Test:
-#####################################################################
-
-qt_add_test(tst_qaudiodecoder
-    SOURCES
-        ../qmultimedia_common/mockaudiodecodercontrol.h
-        ../qmultimedia_common/mockaudiodecoderservice.h
-        ../qmultimedia_common/mockmediaservice.h
-        ../qmultimedia_common/mockmediaserviceprovider.h
-        ../qmultimedia_common/mockmediasource.h
-        tst_qaudiodecoder.cpp
-    INCLUDE_DIRECTORIES
-        ../../../../src/multimedia
-        ../../../../src/multimedia/audio
-        ../../../src/multimedia
-        ../../../src/multimedia/audio
-        ../../../src/multimedia/controls
-        ../qmultimedia_common ../qmultimedia_common
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::Multimedia
-        Qt::MultimediaPrivate
-)
-
-#### Keys ignored in scope 1:.:.:qaudiodecoder.pro:<TRUE>:
-# TEMPLATE = "app"
diff --git a/tests/auto/unit/qaudiodecoder/qaudiodecoder.pro b/tests/auto/unit/qaudiodecoder/qaudiodecoder.pro
deleted file mode 100644
index 4534fb4fe..000000000
--- a/tests/auto/unit/qaudiodecoder/qaudiodecoder.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-QT += multimedia multimedia-private testlib gui
-
-TARGET = tst_qaudiodecoder
-
-CONFIG += testcase
-
-TEMPLATE = app
-
-INCLUDEPATH += \
-    ../../../../src/multimedia/audio
-
-include (../qmultimedia_common/mock.pri)
-include (../qmultimedia_common/mockdecoder.pri)
-
-SOURCES += tst_qaudiodecoder.cpp
diff --git a/tests/auto/unit/qaudioprobe/CMakeLists.txt b/tests/auto/unit/qaudioprobe/CMakeLists.txt
deleted file mode 100644
index 60aff1ee3..000000000
--- a/tests/auto/unit/qaudioprobe/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-# Generated from qaudioprobe.pro.
-
-#####################################################################
-## tst_qaudioprobe Test:
-#####################################################################
-
-qt_add_test(tst_qaudioprobe
-    SOURCES
-        ../qmultimedia_common/mockaudioencodercontrol.h
-        ../qmultimedia_common/mockaudioprobecontrol.h
-        ../qmultimedia_common/mockmediacontainercontrol.h
-        ../qmultimedia_common/mockmediarecordercontrol.h
-        ../qmultimedia_common/mockmediarecorderservice.h
-        ../qmultimedia_common/mockmediaservice.h
-        ../qmultimedia_common/mockmediaserviceprovider.h
-        ../qmultimedia_common/mockmediasource.h
-        ../qmultimedia_common/mockmetadatareadercontrol.h
-        ../qmultimedia_common/mockmetadatawritercontrol.h
-        ../qmultimedia_common/mockvideoencodercontrol.h
-        tst_qaudioprobe.cpp
-    INCLUDE_DIRECTORIES
-        ../../../../src/multimedia
-        ../../../src/multimedia
-        ../../../src/multimedia/audio
-        ../../../src/multimedia/video
-        ../qmultimedia_common
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::MultimediaPrivate
-)
diff --git a/tests/auto/unit/qaudiorecorder/CMakeLists.txt b/tests/auto/unit/qaudiorecorder/CMakeLists.txt
deleted file mode 100644
index 17c2dfb3f..000000000
--- a/tests/auto/unit/qaudiorecorder/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-# Generated from qaudiorecorder.pro.
-
-#####################################################################
-## tst_qaudiorecorder Test:
-#####################################################################
-
-qt_add_test(tst_qaudiorecorder
-    SOURCES
-        ../qmultimedia_common/mockaudioencodercontrol.h
-        ../qmultimedia_common/mockaudioprobecontrol.h
-        ../qmultimedia_common/mockmediacontainercontrol.h
-        ../qmultimedia_common/mockmediarecordercontrol.h
-        ../qmultimedia_common/mockmediarecorderservice.h
-        ../qmultimedia_common/mockmediaservice.h
-        ../qmultimedia_common/mockmediaserviceprovider.h
-        ../qmultimedia_common/mockmediasource.h
-        ../qmultimedia_common/mockmetadatareadercontrol.h
-        ../qmultimedia_common/mockmetadatawritercontrol.h
-        ../qmultimedia_common/mockvideoencodercontrol.h
-        tst_qaudiorecorder.cpp
-    INCLUDE_DIRECTORIES
-        ../../../../src/multimedia
-        ../../../src/multimedia
-        ../../../src/multimedia/audio
-        ../../../src/multimedia/video
-        ../qmultimedia_common
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::MultimediaPrivate
-)
diff --git a/tests/auto/unit/qcamera/CMakeLists.txt b/tests/auto/unit/qcamera/CMakeLists.txt
deleted file mode 100644
index 41387043d..000000000
--- a/tests/auto/unit/qcamera/CMakeLists.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-# Generated from qcamera.pro.
-
-#####################################################################
-## tst_qcamera Test:
-#####################################################################
-
-qt_add_test(tst_qcamera
-    SOURCES
-        ../qmultimedia_common/mockcameracontrol.h
-        ../qmultimedia_common/mockcameraexposurecontrol.h
-        ../qmultimedia_common/mockcamerafocuscontrol.h
-        ../qmultimedia_common/mockcameraimagecapturecontrol.h
-        ../qmultimedia_common/mockcameraimageprocessingcontrol.h
-        ../qmultimedia_common/mockcameraservice.h
-        ../qmultimedia_common/mockimageencodercontrol.h
-        ../qmultimedia_common/mockmediaservice.h
-        ../qmultimedia_common/mockmediaserviceprovider.h
-        ../qmultimedia_common/mockmediasource.h
-        ../qmultimedia_common/mockvideodeviceselectorcontrol.h
-        ../qmultimedia_common/mockvideorenderercontrol.h
-        ../qmultimedia_common/mockvideosurface.h
-        ../qmultimedia_common/mockvideowindowcontrol.h
-        tst_qcamera.cpp
-    INCLUDE_DIRECTORIES
-        ../../../../src/multimedia ../../../../src/multimedia
-        ../../../../src/multimedia/camera
-        ../../../../src/multimedia/video
-        ../../../src/multimedia
-        ../../../src/multimedia/video
-        ../qmultimedia_common ../qmultimedia_common ../qmultimedia_common
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::MultimediaPrivate
-)
diff --git a/tests/auto/unit/qcameraimagecapture/CMakeLists.txt b/tests/auto/unit/qcameraimagecapture/CMakeLists.txt
deleted file mode 100644
index 585c4cf7a..000000000
--- a/tests/auto/unit/qcameraimagecapture/CMakeLists.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-# Generated from qcameraimagecapture.pro.
-
-#####################################################################
-## tst_qcameraimagecapture Test:
-#####################################################################
-
-qt_add_test(tst_qcameraimagecapture
-    SOURCES
-        ../qmultimedia_common/mockcameracontrol.h
-        ../qmultimedia_common/mockcameraexposurecontrol.h
-        ../qmultimedia_common/mockcamerafocuscontrol.h
-        ../qmultimedia_common/mockcameraimagecapturecontrol.h
-        ../qmultimedia_common/mockcameraimageprocessingcontrol.h
-        ../qmultimedia_common/mockcameraservice.h
-        ../qmultimedia_common/mockimageencodercontrol.h
-        ../qmultimedia_common/mockmediaservice.h
-        ../qmultimedia_common/mockmediaserviceprovider.h
-        ../qmultimedia_common/mockmediasource.h
-        ../qmultimedia_common/mockvideodeviceselectorcontrol.h
-        ../qmultimedia_common/mockvideorenderercontrol.h
-        ../qmultimedia_common/mockvideosurface.h
-        ../qmultimedia_common/mockvideowindowcontrol.h
-        tst_qcameraimagecapture.cpp
-    INCLUDE_DIRECTORIES
-        ../../../../src/multimedia ../../../../src/multimedia
-        ../../../../src/multimedia/camera
-        ../../../../src/multimedia/video
-        ../../../src/multimedia
-        ../../../src/multimedia/video
-        ../qmultimedia_common ../qmultimedia_common ../qmultimedia_common
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::MultimediaPrivate
-)
diff --git a/tests/auto/unit/qcamerainfo/CMakeLists.txt b/tests/auto/unit/qcamerainfo/CMakeLists.txt
deleted file mode 100644
index 45ce616fe..000000000
--- a/tests/auto/unit/qcamerainfo/CMakeLists.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-# Generated from qcamerainfo.pro.
-
-#####################################################################
-## tst_qcamerainfo Test:
-#####################################################################
-
-qt_add_test(tst_qcamerainfo
-    SOURCES
-        ../qmultimedia_common/mockcameracontrol.h
-        ../qmultimedia_common/mockcameraexposurecontrol.h
-        ../qmultimedia_common/mockcamerafocuscontrol.h
-        ../qmultimedia_common/mockcameraimagecapturecontrol.h
-        ../qmultimedia_common/mockcameraimageprocessingcontrol.h
-        ../qmultimedia_common/mockcameraservice.h
-        ../qmultimedia_common/mockimageencodercontrol.h
-        ../qmultimedia_common/mockmediaservice.h
-        ../qmultimedia_common/mockmediaserviceprovider.h
-        ../qmultimedia_common/mockmediasource.h
-        ../qmultimedia_common/mockvideodeviceselectorcontrol.h
-        ../qmultimedia_common/mockvideorenderercontrol.h
-        ../qmultimedia_common/mockvideosurface.h
-        ../qmultimedia_common/mockvideowindowcontrol.h
-        tst_qcamerainfo.cpp
-    INCLUDE_DIRECTORIES
-        ../../../../src/multimedia ../../../../src/multimedia
-        ../../../../src/multimedia/camera
-        ../../../../src/multimedia/video
-        ../../../src/multimedia
-        ../../../src/multimedia/video
-        ../qmultimedia_common ../qmultimedia_common ../qmultimedia_common
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::MultimediaPrivate
-)
diff --git a/tests/auto/unit/qcamerawidgets/CMakeLists.txt b/tests/auto/unit/qcamerawidgets/CMakeLists.txt
deleted file mode 100644
index eb9a030c2..000000000
--- a/tests/auto/unit/qcamerawidgets/CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-# Generated from qcamerawidgets.pro.
-
-#####################################################################
-## tst_qcamerawidgets Test:
-#####################################################################
-
-qt_add_test(tst_qcamerawidgets
-    SOURCES
-        ../qmultimedia_common/mockcameracontrol.h
-        ../qmultimedia_common/mockcameraexposurecontrol.h
-        ../qmultimedia_common/mockcamerafocuscontrol.h
-        ../qmultimedia_common/mockcameraimagecapturecontrol.h
-        ../qmultimedia_common/mockcameraimageprocessingcontrol.h
-        ../qmultimedia_common/mockcameraservice.h
-        ../qmultimedia_common/mockimageencodercontrol.h
-        ../qmultimedia_common/mockmediaservice.h
-        ../qmultimedia_common/mockmediaserviceprovider.h
-        ../qmultimedia_common/mockmediasource.h
-        ../qmultimedia_common/mockvideodeviceselectorcontrol.h
-        ../qmultimedia_common/mockvideorenderercontrol.h
-        ../qmultimedia_common/mockvideosurface.h
-        ../qmultimedia_common/mockvideowindowcontrol.h
-        tst_qcamerawidgets.cpp
-    INCLUDE_DIRECTORIES
-        ../../../../src/multimedia ../../../../src/multimedia
-        ../../../../src/multimedia/camera
-        ../../../../src/multimedia/video
-        ../../../src/multimedia
-        ../../../src/multimedia/video
-        ../qmultimedia_common ../qmultimedia_common ../qmultimedia_common
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::MultimediaPrivate
-        Qt::MultimediaWidgetsPrivate
-        Qt::Widgets
-)
diff --git a/tests/auto/unit/qdeclarativeaudio/CMakeLists.txt b/tests/auto/unit/qdeclarativeaudio/CMakeLists.txt
deleted file mode 100644
index 3d90b60fe..000000000
--- a/tests/auto/unit/qdeclarativeaudio/CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-# Generated from qdeclarativeaudio.pro.
-
-#####################################################################
-## tst_qdeclarativeaudio Test:
-#####################################################################
-
-qt_add_test(tst_qdeclarativeaudio
-    SOURCES
-        ../../../../src/imports/multimedia/qdeclarativeaudio.cpp ../../../../src/imports/multimedia/qdeclarativeaudio_p.h
-        ../../../../src/imports/multimedia/qdeclarativemediametadata_p.h
-        ../../../../src/imports/multimedia/qdeclarativeplaylist.cpp ../../../../src/imports/multimedia/qdeclarativeplaylist_p.h
-        ../qmultimedia_common/mockmediaplayercontrol.h
-        ../qmultimedia_common/mockmediaplayerservice.h
-        ../qmultimedia_common/mockmediaservice.h
-        ../qmultimedia_common/mockmediaserviceprovider.h
-        ../qmultimedia_common/mockmediasource.h
-        ../qmultimedia_common/mockmediastreamscontrol.h
-        ../qmultimedia_common/mockvideoprobecontrol.h
-        ../qmultimedia_common/mockvideorenderercontrol.h
-        ../qmultimedia_common/mockvideosurface.h
-        ../qmultimedia_common/mockvideowindowcontrol.h
-        tst_qdeclarativeaudio.cpp
-    INCLUDE_DIRECTORIES
-        ../../../../src/imports/multimedia
-        ../../../../src/multimedia
-        ../../../src/multimedia ../../../src/multimedia
-        ../../../src/multimedia/audio
-        ../../../src/multimedia/video ../../../src/multimedia/video
-        ../qmultimedia_common ../qmultimedia_common
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::MultimediaPrivate
-        Qt::MultimediaQuickPrivate
-        Qt::Qml
-)
diff --git a/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro b/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro
deleted file mode 100644
index 6d8b3c215..000000000
--- a/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro
+++ /dev/null
@@ -1,20 +0,0 @@
-CONFIG += testcase
-TARGET = tst_qdeclarativeaudio
-
-QT += multimedia-private qml testlib qtmultimediaquicktools-private
-
-HEADERS += \
-        ../../../../src/imports/multimedia/qdeclarativeaudio_p.h \
-        ../../../../src/imports/multimedia/qdeclarativeplaylist_p.h \
-        ../../../../src/imports/multimedia/qdeclarativemediametadata_p.h
-
-SOURCES += \
-        tst_qdeclarativeaudio.cpp \
-        ../../../../src/imports/multimedia/qdeclarativeplaylist.cpp \
-        ../../../../src/imports/multimedia/qdeclarativeaudio.cpp
-
-INCLUDEPATH += ../../../../src/imports/multimedia
-
-include (../qmultimedia_common/mock.pri)
-include (../qmultimedia_common/mockplayer.pri)
-
diff --git a/tests/auto/unit/qdeclarativecamera/CMakeLists.txt b/tests/auto/unit/qdeclarativecamera/CMakeLists.txt
deleted file mode 100644
index 8395d25c9..000000000
--- a/tests/auto/unit/qdeclarativecamera/CMakeLists.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-# Generated from qdeclarativecamera.pro.
-
-#####################################################################
-## tst_qdeclarativecamera Test:
-#####################################################################
-
-qt_add_test(tst_qdeclarativecamera
-    GUI
-    QMLTEST
-    SOURCES
-        ../qmultimedia_common/mockcameracontrol.h
-        ../qmultimedia_common/mockcameraexposurecontrol.h
-        ../qmultimedia_common/mockcamerafocuscontrol.h
-        ../qmultimedia_common/mockcameraimagecapturecontrol.h
-        ../qmultimedia_common/mockcameraimageprocessingcontrol.h
-        ../qmultimedia_common/mockcameraservice.h
-        ../qmultimedia_common/mockimageencodercontrol.h
-        ../qmultimedia_common/mockmediaservice.h
-        ../qmultimedia_common/mockmediaserviceprovider.h
-        ../qmultimedia_common/mockmediasource.h
-        ../qmultimedia_common/mockvideodeviceselectorcontrol.h
-        ../qmultimedia_common/mockvideorenderercontrol.h
-        ../qmultimedia_common/mockvideosurface.h
-        ../qmultimedia_common/mockvideowindowcontrol.h
-        tst_qdeclarativecamera.cpp
-    INCLUDE_DIRECTORIES
-        ../../../../src/multimedia ../../../../src/multimedia
-        ../../../../src/multimedia/camera
-        ../../../../src/multimedia/video
-        ../../../src/multimedia
-        ../../../src/multimedia/video
-        ../qmultimedia_common ../qmultimedia_common ../qmultimedia_common
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::MultimediaPrivate
-)
-
-#### Keys ignored in scope 1:.:.:qdeclarativecamera.pro:<TRUE>:
-# OTHER_FILES = "tst_qdeclarativecamera.qml"
diff --git a/tests/auto/unit/qdeclarativemultimediaglobal/CMakeLists.txt b/tests/auto/unit/qdeclarativemultimediaglobal/CMakeLists.txt
deleted file mode 100644
index 4e848b539..000000000
--- a/tests/auto/unit/qdeclarativemultimediaglobal/CMakeLists.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-# Generated from qdeclarativemultimediaglobal.pro.
-
-#####################################################################
-## tst_qdeclarativemultimediaglobal Test:
-#####################################################################
-
-qt_add_test(tst_qdeclarativemultimediaglobal
-    GUI
-    QMLTEST
-    SOURCES
-        ../qmultimedia_common/mockcameracontrol.h
-        ../qmultimedia_common/mockcameraexposurecontrol.h
-        ../qmultimedia_common/mockcamerafocuscontrol.h
-        ../qmultimedia_common/mockcameraimagecapturecontrol.h
-        ../qmultimedia_common/mockcameraimageprocessingcontrol.h
-        ../qmultimedia_common/mockcameraservice.h
-        ../qmultimedia_common/mockimageencodercontrol.h
-        ../qmultimedia_common/mockmediaservice.h
-        ../qmultimedia_common/mockmediaserviceprovider.h
-        ../qmultimedia_common/mockmediasource.h
-        ../qmultimedia_common/mockvideodeviceselectorcontrol.h
-        ../qmultimedia_common/mockvideorenderercontrol.h
-        ../qmultimedia_common/mockvideosurface.h
-        ../qmultimedia_common/mockvideowindowcontrol.h
-        tst_qdeclarativemultimediaglobal.cpp
-    INCLUDE_DIRECTORIES
-        ../../../../src/multimedia ../../../../src/multimedia
-        ../../../../src/multimedia/camera
-        ../../../../src/multimedia/video
-        ../../../src/multimedia
-        ../../../src/multimedia/video
-        ../qmultimedia_common ../qmultimedia_common ../qmultimedia_common
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::MultimediaPrivate
-)
-
-#### Keys ignored in scope 1:.:.:qdeclarativemultimediaglobal.pro:<TRUE>:
-# OTHER_FILES = "tst_qdeclarativemultimediaglobal.qml"
diff --git a/tests/auto/unit/qmediacontent/CMakeLists.txt b/tests/auto/unit/qmediacontent/CMakeLists.txt
deleted file mode 100644
index 08071b696..000000000
--- a/tests/auto/unit/qmediacontent/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-# Generated from qmediacontent.pro.
-
-#####################################################################
-## tst_QUrl Test:
-#####################################################################
-
-qt_add_test(tst_QUrl
-    SOURCES
-        tst_QUrl.cpp
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::MultimediaPrivate
-        Qt::Network
-)
diff --git a/tests/auto/unit/qmediacontent/qmediacontent.pro b/tests/auto/unit/qmediacontent/qmediacontent.pro
deleted file mode 100644
index 1aafb85ca..000000000
--- a/tests/auto/unit/qmediacontent/qmediacontent.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-CONFIG += testcase
-TARGET = tst_QUrl
-
-QT += multimedia-private network testlib
-
-SOURCES += tst_QUrl.cpp
diff --git a/tests/auto/unit/qmediacontent/tst_qmediacontent.cpp b/tests/auto/unit/qmediacontent/tst_qmediacontent.cpp
deleted file mode 100644
index 1dff338e5..000000000
--- a/tests/auto/unit/qmediacontent/tst_qmediacontent.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtTest/QtTest>
-#include <QtNetwork/qnetworkrequest.h>
-
-#include <QUrl.h>
-#include <qmediaplaylist.h>
-
-//TESTED_COMPONENT=src/multimedia
-
-QT_USE_NAMESPACE
-class tst_QUrl : public QObject
-{
-    Q_OBJECT
-
-private slots:
-    void testNull();
-    void testUrlCtor();
-    void testRequestCtor();
-    void testCopy();
-    void testAssignment();
-    void testEquality();
-    void testPlaylist();
-};
-
-void tst_QUrl::testNull()
-{
-    QUrl media;
-
-    QCOMPARE(media.isNull(), true);
-    QCOMPARE(media.request().url(), QUrl());
-}
-
-void tst_QUrl::testUrlCtor()
-{
-    QUrl media(QUrl("http://example.com/movie.mov"));
-    QCOMPARE(media.request().url(), QUrl("http://example.com/movie.mov"));
-}
-
-void tst_QUrl::testRequestCtor()
-{
-    QNetworkRequest request(QUrl("http://example.com/movie.mov"));
-    request.setAttribute(QNetworkRequest::User, QVariant(1234));
-
-    QUrl media(request);
-    QCOMPARE(media.request().url(), QUrl("http://example.com/movie.mov"));
-    QCOMPARE(media.request(), request);
-}
-
-void tst_QUrl::testCopy()
-{
-    QUrl media1(QUrl("http://example.com/movie.mov"));
-    QUrl media2(media1);
-
-    QVERIFY(media1 == media2);
-}
-
-void tst_QUrl::testAssignment()
-{
-    QUrl media1(QUrl("http://example.com/movie.mov"));
-    QUrl media2;
-    QUrl media3;
-
-    media2 = media1;
-    QVERIFY(media2 == media1);
-
-    media2 = media3;
-    QVERIFY(media2 == media3);
-}
-
-void tst_QUrl::testEquality()
-{
-    QUrl media1;
-    QUrl media2;
-    QUrl media3(QUrl("http://example.com/movie.mov"));
-    QUrl media4(QUrl("http://example.com/movie.mov"));
-    QUrl media5(QUrl("file:///some/where/over/the/rainbow.mp3"));
-
-    // null == null
-    QCOMPARE(media1 == media2, true);
-    QCOMPARE(media1 != media2, false);
-
-    // null != something
-    QCOMPARE(media1 == media3, false);
-    QCOMPARE(media1 != media3, true);
-
-    // equiv
-    QCOMPARE(media3 == media4, true);
-    QCOMPARE(media3 != media4, false);
-
-    // not equiv
-    QCOMPARE(media4 == media5, false);
-    QCOMPARE(media4 != media5, true);
-}
-
-void tst_QUrl::testPlaylist()
-{
-    QUrl media(QUrl("http://example.com/movie.mov"));
-    QVERIFY(media.request().url().isValid());
-    QVERIFY(!media.playlist());
-
-    {
-        QPointer<QMediaPlaylist> playlist(new QMediaPlaylist);
-        media = QUrl(playlist.data(), QUrl("http://example.com/sample.m3u"), true);
-        QVERIFY(media.request().url().isValid());
-        QCOMPARE(media.playlist(), playlist.data());
-        media = QUrl();
-        // Make sure playlist is destroyed by QUrl
-        QTRY_VERIFY(!playlist);
-    }
-
-    {
-        QMediaPlaylist *playlist = new QMediaPlaylist;
-        media = QUrl(playlist, QUrl("http://example.com/sample.m3u"), true);
-        // Delete playlist outside QUrl
-        delete playlist;
-        QVERIFY(!media.playlist());
-        media = QUrl();
-    }
-
-    {
-        QPointer<QMediaPlaylist> playlist(new QMediaPlaylist);
-        media = QUrl(playlist.data(), QUrl(), false);
-        QVERIFY(!media.request().url().isValid());
-        QCOMPARE(media.playlist(), playlist.data());
-        media = QUrl();
-        QVERIFY(playlist);
-        delete playlist.data();
-    }
-}
-
-QTEST_MAIN(tst_QUrl)
-
-#include "tst_QUrl.moc"
diff --git a/tests/auto/unit/qmediaplayer/CMakeLists.txt b/tests/auto/unit/qmediaplayer/CMakeLists.txt
deleted file mode 100644
index 112adde71..000000000
--- a/tests/auto/unit/qmediaplayer/CMakeLists.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-# Generated from qmediaplayer.pro.
-
-#####################################################################
-## tst_qmediaplayer Test:
-#####################################################################
-
-qt_add_test(tst_qmediaplayer
-    SOURCES
-        ../qmultimedia_common/mockmediaplayercontrol.h
-        ../qmultimedia_common/mockmediaplayerservice.h
-        ../qmultimedia_common/mockmediaservice.h
-        ../qmultimedia_common/mockmediaserviceprovider.h
-        ../qmultimedia_common/mockmediasource.h
-        ../qmultimedia_common/mockmediastreamscontrol.h
-        ../qmultimedia_common/mockvideoprobecontrol.h
-        ../qmultimedia_common/mockvideorenderercontrol.h
-        ../qmultimedia_common/mockvideosurface.h
-        ../qmultimedia_common/mockvideowindowcontrol.h
-        tst_qmediaplayer.cpp
-    INCLUDE_DIRECTORIES
-        ../../../../src/multimedia
-        ../../../src/multimedia ../../../src/multimedia
-        ../../../src/multimedia/audio
-        ../../../src/multimedia/video ../../../src/multimedia/video
-        ../qmultimedia_common ../qmultimedia_common
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::MultimediaPrivate
-        Qt::Network
-)
-
-# Resources:
-set(testdata_resource_files
-    "testdata/nokia-tune.mp3"
-)
-
-qt_add_resource(tst_qmediaplayer "testdata"
-    PREFIX
-        "/"
-    FILES
-        ${testdata_resource_files}
-)
-
diff --git a/tests/auto/unit/qmediaplayerwidgets/CMakeLists.txt b/tests/auto/unit/qmediaplayerwidgets/CMakeLists.txt
deleted file mode 100644
index abda4aec0..000000000
--- a/tests/auto/unit/qmediaplayerwidgets/CMakeLists.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-# Generated from qmediaplayerwidgets.pro.
-
-#####################################################################
-## tst_qmediaplayerwidgets Test:
-#####################################################################
-
-qt_add_test(tst_qmediaplayerwidgets
-    SOURCES
-        ../qmultimedia_common/mockmediaplayercontrol.h
-        ../qmultimedia_common/mockmediaplayerservice.h
-        ../qmultimedia_common/mockmediaservice.h
-        ../qmultimedia_common/mockmediaserviceprovider.h
-        ../qmultimedia_common/mockmediasource.h
-        ../qmultimedia_common/mockmediastreamscontrol.h
-        ../qmultimedia_common/mockvideoprobecontrol.h
-        ../qmultimedia_common/mockvideorenderercontrol.h
-        ../qmultimedia_common/mockvideosurface.h
-        ../qmultimedia_common/mockvideowindowcontrol.h
-        tst_qmediaplayerwidgets.cpp
-    INCLUDE_DIRECTORIES
-        ../../../../src/multimedia
-        ../../../src/multimedia ../../../src/multimedia
-        ../../../src/multimedia/audio
-        ../../../src/multimedia/video ../../../src/multimedia/video
-        ../qmultimedia_common ../qmultimedia_common
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::MultimediaPrivate
-        Qt::MultimediaWidgetsPrivate
-        Qt::Network
-        Qt::Widgets
-)
diff --git a/tests/auto/unit/qmediarecorder/CMakeLists.txt b/tests/auto/unit/qmediarecorder/CMakeLists.txt
deleted file mode 100644
index b91503f55..000000000
--- a/tests/auto/unit/qmediarecorder/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-# Generated from qmediarecorder.pro.
-
-#####################################################################
-## tst_qmediarecorder Test:
-#####################################################################
-
-qt_add_test(tst_qmediarecorder
-    SOURCES
-        ../qmultimedia_common/mockaudioencodercontrol.h
-        ../qmultimedia_common/mockaudioprobecontrol.h
-        ../qmultimedia_common/mockmediacontainercontrol.h
-        ../qmultimedia_common/mockmediarecordercontrol.h
-        ../qmultimedia_common/mockmediarecorderservice.h
-        ../qmultimedia_common/mockmediaservice.h
-        ../qmultimedia_common/mockmediaserviceprovider.h
-        ../qmultimedia_common/mockmediasource.h
-        ../qmultimedia_common/mockmetadatareadercontrol.h
-        ../qmultimedia_common/mockmetadatawritercontrol.h
-        ../qmultimedia_common/mockvideoencodercontrol.h
-        tst_qmediarecorder.cpp
-    INCLUDE_DIRECTORIES
-        ../../../../src/multimedia
-        ../../../src/multimedia
-        ../../../src/multimedia/audio
-        ../../../src/multimedia/video
-        ../qmultimedia_common
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::MultimediaPrivate
-)
diff --git a/tests/auto/unit/qmediasink/CMakeLists.txt b/tests/auto/unit/qmediasink/CMakeLists.txt
deleted file mode 100644
index 982232b04..000000000
--- a/tests/auto/unit/qmediasink/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-# Generated from qmediasink.pro.
-
-#####################################################################
-## tst_qmediasink Test:
-#####################################################################
-
-qt_add_test(tst_qmediasink
-    SOURCES
-        ../qmultimedia_common/mockaudioencodercontrol.h
-        ../qmultimedia_common/mockaudioprobecontrol.h
-        ../qmultimedia_common/mockmediacontainercontrol.h
-        ../qmultimedia_common/mockmediarecordercontrol.h
-        ../qmultimedia_common/mockmediarecorderservice.h
-        ../qmultimedia_common/mockmediaservice.h
-        ../qmultimedia_common/mockmediaserviceprovider.h
-        ../qmultimedia_common/mockmediasource.h
-        ../qmultimedia_common/mockmetadatareadercontrol.h
-        ../qmultimedia_common/mockmetadatawritercontrol.h
-        ../qmultimedia_common/mockvideoencodercontrol.h
-        tst_qmediasink.cpp
-    INCLUDE_DIRECTORIES
-        ../../../../src/multimedia
-        ../../../src/multimedia
-        ../../../src/multimedia/audio
-        ../../../src/multimedia/video
-        ../qmultimedia_common
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::MultimediaPrivate
-)
diff --git a/tests/auto/unit/qmediasource/CMakeLists.txt b/tests/auto/unit/qmediasource/CMakeLists.txt
deleted file mode 100644
index 49f4ca0f2..000000000
--- a/tests/auto/unit/qmediasource/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-# Generated from qmediasource.pro.
-
-#####################################################################
-## tst_qmediasource Test:
-#####################################################################
-
-qt_add_test(tst_qmediasource
-    SOURCES
-        ../qmultimedia_common/mockaudioencodercontrol.h
-        ../qmultimedia_common/mockaudioprobecontrol.h
-        ../qmultimedia_common/mockmediacontainercontrol.h
-        ../qmultimedia_common/mockmediarecordercontrol.h
-        ../qmultimedia_common/mockmediarecorderservice.h
-        ../qmultimedia_common/mockmediaservice.h
-        ../qmultimedia_common/mockmediaserviceprovider.h
-        ../qmultimedia_common/mockmediasource.h
-        ../qmultimedia_common/mockmetadatareadercontrol.h
-        ../qmultimedia_common/mockmetadatawritercontrol.h
-        ../qmultimedia_common/mockvideoencodercontrol.h
-        tst_qmediasource.cpp
-    INCLUDE_DIRECTORIES
-        ../../../../src/multimedia
-        ../../../src/multimedia
-        ../../../src/multimedia/audio
-        ../../../src/multimedia/video
-        ../qmultimedia_common ../qmultimedia_common
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::MultimediaPrivate
-)
diff --git a/tests/auto/unit/qml/CMakeLists.txt b/tests/auto/unit/qml/CMakeLists.txt
new file mode 100644
index 000000000..fb8365592
--- /dev/null
+++ b/tests/auto/unit/qml/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Generated from qml.pro.
+
+add_subdirectory(qdeclarativemultimediaglobal)
+add_subdirectory(qdeclarativeaudio)
+add_subdirectory(qdeclarativecamera)
+if(disabled)
+    add_subdirectory(qdeclarativevideo)
+endif()
diff --git a/tests/auto/unit/qml/qdeclarativeaudio/CMakeLists.txt b/tests/auto/unit/qml/qdeclarativeaudio/CMakeLists.txt
new file mode 100644
index 000000000..cd2d0fa09
--- /dev/null
+++ b/tests/auto/unit/qml/qdeclarativeaudio/CMakeLists.txt
@@ -0,0 +1,23 @@
+# Generated from qdeclarativeaudio.pro.
+
+#####################################################################
+## tst_qdeclarativeaudio Test:
+#####################################################################
+
+qt_add_test(tst_qdeclarativeaudio
+    SOURCES
+        ../../../../../src/imports/multimedia/qdeclarativeaudio.cpp ../../../../../src/imports/multimedia/qdeclarativeaudio_p.h
+        ../../../../../src/imports/multimedia/qdeclarativemediametadata_p.h
+        ../../../../../src/imports/multimedia/qdeclarativeplaylist.cpp ../../../../../src/imports/multimedia/qdeclarativeplaylist_p.h
+        tst_qdeclarativeaudio.cpp
+    INCLUDE_DIRECTORIES
+        ../../../../../src/imports/multimedia
+        ../../mockbackend
+    PUBLIC_LIBRARIES
+        # Remove: L${CMAKE_CURRENT_SOURCE_DIR}
+        Qt::Gui
+        Qt::MultimediaPrivate
+        Qt::MultimediaQuickPrivate
+        Qt::Qml
+        QtMultimediaMockBackend
+)
diff --git a/tests/auto/unit/qml/qdeclarativeaudio/qdeclarativeaudio.pro b/tests/auto/unit/qml/qdeclarativeaudio/qdeclarativeaudio.pro
new file mode 100644
index 000000000..78668af90
--- /dev/null
+++ b/tests/auto/unit/qml/qdeclarativeaudio/qdeclarativeaudio.pro
@@ -0,0 +1,19 @@
+CONFIG += testcase
+TARGET = tst_qdeclarativeaudio
+
+include (../../mockbackend/mockbackend.pri)
+QT += multimedia-private qml testlib qtmultimediaquicktools-private
+
+HEADERS += \
+        ../../../../../src/imports/multimedia/qdeclarativeaudio_p.h \
+        ../../../../../src/imports/multimedia/qdeclarativeplaylist_p.h \
+        ../../../../../src/imports/multimedia/qdeclarativemediametadata_p.h
+
+SOURCES += \
+        tst_qdeclarativeaudio.cpp \
+        ../../../../../src/imports/multimedia/qdeclarativeplaylist.cpp \
+        ../../../../../src/imports/multimedia/qdeclarativeaudio.cpp
+
+INCLUDEPATH += ../../../../../src/imports/multimedia
+
+
diff --git a/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp b/tests/auto/unit/qml/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
index 6112dfbe4..6112dfbe4 100644
--- a/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
+++ b/tests/auto/unit/qml/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
diff --git a/tests/auto/unit/qml/qdeclarativecamera/CMakeLists.txt b/tests/auto/unit/qml/qdeclarativecamera/CMakeLists.txt
new file mode 100644
index 000000000..32fff8b7a
--- /dev/null
+++ b/tests/auto/unit/qml/qdeclarativecamera/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Generated from qdeclarativecamera.pro.
+
+#####################################################################
+## tst_qdeclarativecamera Test:
+#####################################################################
+
+qt_add_test(tst_qdeclarativecamera
+    GUI
+    QMLTEST
+    SOURCES
+        tst_qdeclarativecamera.cpp
+    INCLUDE_DIRECTORIES
+        ../../mockbackend
+    PUBLIC_LIBRARIES
+        # Remove: L${CMAKE_CURRENT_SOURCE_DIR}
+        Qt::Gui
+        Qt::MultimediaPrivate
+        QtMultimediaMockBackend
+)
+
+#### Keys ignored in scope 1:.:.:qdeclarativecamera.pro:<TRUE>:
+# OTHER_FILES = "tst_qdeclarativecamera.qml"
diff --git a/tests/auto/unit/qdeclarativecamera/qdeclarativecamera.pro b/tests/auto/unit/qml/qdeclarativecamera/qdeclarativecamera.pro
index 4e58f2293..3393303f3 100644
--- a/tests/auto/unit/qdeclarativecamera/qdeclarativecamera.pro
+++ b/tests/auto/unit/qml/qdeclarativecamera/qdeclarativecamera.pro
@@ -3,12 +3,10 @@ CONFIG += warn_on qmltestcase
 
 QT += multimedia-private
 
-include (../qmultimedia_common/mock.pri)
-include (../qmultimedia_common/mockcamera.pri)
+include (../../mockbackend/mockbackend.pri)
 
 SOURCES += \
         tst_qdeclarativecamera.cpp
 
-
 OTHER_FILES += \
     tst_qdeclarativecamera.qml
diff --git a/tests/auto/unit/qdeclarativecamera/tst_qdeclarativecamera.cpp b/tests/auto/unit/qml/qdeclarativecamera/tst_qdeclarativecamera.cpp
index 2406e5be8..2406e5be8 100644
--- a/tests/auto/unit/qdeclarativecamera/tst_qdeclarativecamera.cpp
+++ b/tests/auto/unit/qml/qdeclarativecamera/tst_qdeclarativecamera.cpp
diff --git a/tests/auto/unit/qdeclarativecamera/tst_qdeclarativecamera.qml b/tests/auto/unit/qml/qdeclarativecamera/tst_qdeclarativecamera.qml
index 0841d4ec1..0841d4ec1 100644
--- a/tests/auto/unit/qdeclarativecamera/tst_qdeclarativecamera.qml
+++ b/tests/auto/unit/qml/qdeclarativecamera/tst_qdeclarativecamera.qml
diff --git a/tests/auto/unit/qml/qdeclarativemultimediaglobal/CMakeLists.txt b/tests/auto/unit/qml/qdeclarativemultimediaglobal/CMakeLists.txt
new file mode 100644
index 000000000..685585180
--- /dev/null
+++ b/tests/auto/unit/qml/qdeclarativemultimediaglobal/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Generated from qdeclarativemultimediaglobal.pro.
+
+#####################################################################
+## tst_qdeclarativemultimediaglobal Test:
+#####################################################################
+
+qt_add_test(tst_qdeclarativemultimediaglobal
+    GUI
+    QMLTEST
+    SOURCES
+        tst_qdeclarativemultimediaglobal.cpp
+    INCLUDE_DIRECTORIES
+        ../../mockbackend
+    PUBLIC_LIBRARIES
+        # Remove: L${CMAKE_CURRENT_SOURCE_DIR}
+        Qt::Gui
+        Qt::MultimediaPrivate
+        QtMultimediaMockBackend
+)
+
+#### Keys ignored in scope 1:.:.:qdeclarativemultimediaglobal.pro:<TRUE>:
+# OTHER_FILES = "tst_qdeclarativemultimediaglobal.qml"
diff --git a/tests/auto/unit/qdeclarativemultimediaglobal/qdeclarativemultimediaglobal.pro b/tests/auto/unit/qml/qdeclarativemultimediaglobal/qdeclarativemultimediaglobal.pro
index f806b054b..54ce3f675 100644
--- a/tests/auto/unit/qdeclarativemultimediaglobal/qdeclarativemultimediaglobal.pro
+++ b/tests/auto/unit/qml/qdeclarativemultimediaglobal/qdeclarativemultimediaglobal.pro
@@ -3,8 +3,7 @@ CONFIG += warn_on qmltestcase
 
 QT += multimedia-private
 
-include (../qmultimedia_common/mock.pri)
-include (../qmultimedia_common/mockcamera.pri)
+include (../../mockbackend/mockbackend.pri)
 
 SOURCES += \
         tst_qdeclarativemultimediaglobal.cpp
diff --git a/tests/auto/unit/qdeclarativemultimediaglobal/tst_qdeclarativemultimediaglobal.cpp b/tests/auto/unit/qml/qdeclarativemultimediaglobal/tst_qdeclarativemultimediaglobal.cpp
index d78eb0076..d78eb0076 100644
--- a/tests/auto/unit/qdeclarativemultimediaglobal/tst_qdeclarativemultimediaglobal.cpp
+++ b/tests/auto/unit/qml/qdeclarativemultimediaglobal/tst_qdeclarativemultimediaglobal.cpp
diff --git a/tests/auto/unit/qdeclarativemultimediaglobal/tst_qdeclarativemultimediaglobal.qml b/tests/auto/unit/qml/qdeclarativemultimediaglobal/tst_qdeclarativemultimediaglobal.qml
index e44c68a29..e44c68a29 100644
--- a/tests/auto/unit/qdeclarativemultimediaglobal/tst_qdeclarativemultimediaglobal.qml
+++ b/tests/auto/unit/qml/qdeclarativemultimediaglobal/tst_qdeclarativemultimediaglobal.qml
diff --git a/tests/auto/unit/qdeclarativevideo/CMakeLists.txt b/tests/auto/unit/qml/qdeclarativevideo/CMakeLists.txt
index e2587864e..181716475 100644
--- a/tests/auto/unit/qdeclarativevideo/CMakeLists.txt
+++ b/tests/auto/unit/qml/qdeclarativevideo/CMakeLists.txt
@@ -16,5 +16,4 @@ qt_add_test(tst_qdeclarativevideo
         Qt::Gui
         Qt::MultimediaPrivate
         Qt::Qml
-        Qt::Widgets
 )
diff --git a/tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro b/tests/auto/unit/qml/qdeclarativevideo/qdeclarativevideo.pro
index 3ebc4600d..27e2abc5b 100644
--- a/tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro
+++ b/tests/auto/unit/qml/qdeclarativevideo/qdeclarativevideo.pro
@@ -14,4 +14,3 @@ SOURCES += \
         ../../../../src/imports/multimedia/qdeclarativemediabase.cpp
 
 INCLUDEPATH += ../../../../src/imports/multimedia
-QT+=widgets
diff --git a/tests/auto/unit/qdeclarativevideo/tst_qdeclarativevideo.cpp b/tests/auto/unit/qml/qdeclarativevideo/tst_qdeclarativevideo.cpp
index b18b4586d..b18b4586d 100644
--- a/tests/auto/unit/qdeclarativevideo/tst_qdeclarativevideo.cpp
+++ b/tests/auto/unit/qml/qdeclarativevideo/tst_qdeclarativevideo.cpp
diff --git a/tests/auto/unit/multimediaqml.pro b/tests/auto/unit/qml/qml.pro
index e8cdcb67e..e8cdcb67e 100644
--- a/tests/auto/unit/multimediaqml.pro
+++ b/tests/auto/unit/qml/qml.pro
diff --git a/tests/auto/unit/qmultimedia_common/mock.pri b/tests/auto/unit/qmultimedia_common/mock.pri
deleted file mode 100644
index 0fc02e184..000000000
--- a/tests/auto/unit/qmultimedia_common/mock.pri
+++ /dev/null
@@ -1,7 +0,0 @@
-INCLUDEPATH += $$PWD \
-    ../../../../src/multimedia \
-
-HEADERS *= \
-    ../qmultimedia_common/mockmediaserviceprovider.h \
-    ../qmultimedia_common/mockmediaservice.h \
-    ../qmultimedia_common/mockmediasource.h \
diff --git a/tests/auto/unit/qmultimedia_common/mockcamera.pri b/tests/auto/unit/qmultimedia_common/mockcamera.pri
deleted file mode 100644
index de852fb91..000000000
--- a/tests/auto/unit/qmultimedia_common/mockcamera.pri
+++ /dev/null
@@ -1,19 +0,0 @@
-# Camera related mock backend files
-INCLUDEPATH += $$PWD \
-    ../../../../src/multimedia \
-    ../../../../src/multimedia/video \
-    ../../../../src/multimedia/camera
-
-HEADERS *= \
-    ../qmultimedia_common/mockcameraservice.h \
-    ../qmultimedia_common/mockcamerafocuscontrol.h \
-    ../qmultimedia_common/mockcameraimageprocessingcontrol.h \
-    ../qmultimedia_common/mockcameraimagecapturecontrol.h \
-    ../qmultimedia_common/mockcameraexposurecontrol.h \
-    ../qmultimedia_common/mockimageencodercontrol.h \
-    ../qmultimedia_common/mockcameracontrol.h \
-    ../qmultimedia_common/mockvideodeviceselectorcontrol.h
-
-
-include(mockvideo.pri)
-
diff --git a/tests/auto/unit/qmultimedia_common/mockcontainer.pri b/tests/auto/unit/qmultimedia_common/mockcontainer.pri
deleted file mode 100644
index e4a345adb..000000000
--- a/tests/auto/unit/qmultimedia_common/mockcontainer.pri
+++ /dev/null
@@ -1,7 +0,0 @@
-INCLUDEPATH *= $$PWD \
-    ../../../src/multimedia \
-
-HEADERS *= \
-    ../qmultimedia_common/mockmediacontainercontrol.h \
-    ../qmultimedia_common/mockmetadatawritercontrol.h \
-    ../qmultimedia_common/mockmetadatareadercontrol.h
diff --git a/tests/auto/unit/qmultimedia_common/mockdecoder.pri b/tests/auto/unit/qmultimedia_common/mockdecoder.pri
deleted file mode 100644
index 8b486e475..000000000
--- a/tests/auto/unit/qmultimedia_common/mockdecoder.pri
+++ /dev/null
@@ -1,9 +0,0 @@
-# Audio decoder related mock backend files
-INCLUDEPATH += $$PWD \
-    ../../../src/multimedia \
-    ../../../src/multimedia/audio \
-    ../../../src/multimedia/controls
-
-HEADERS *= \
-    ../qmultimedia_common/mockaudiodecoderservice.h \
-    ../qmultimedia_common/mockaudiodecodercontrol.h
diff --git a/tests/auto/unit/qmultimedia_common/mockplayer.pri b/tests/auto/unit/qmultimedia_common/mockplayer.pri
deleted file mode 100644
index 969648cbe..000000000
--- a/tests/auto/unit/qmultimedia_common/mockplayer.pri
+++ /dev/null
@@ -1,12 +0,0 @@
-INCLUDEPATH *= $$PWD \
-    ../../../src/multimedia \
-    ../../../src/multimedia/audio \
-    ../../../src/multimedia/video \
-
-HEADERS *= \
-    ../qmultimedia_common/mockmediaplayerservice.h \
-    ../qmultimedia_common/mockmediaplayercontrol.h \
-    ../qmultimedia_common/mockmediastreamscontrol.h \
-    ../qmultimedia_common/mockvideoprobecontrol.h
-
-include(mockvideo.pri)
diff --git a/tests/auto/unit/qmultimedia_common/mockrecorder.pri b/tests/auto/unit/qmultimedia_common/mockrecorder.pri
deleted file mode 100644
index f14bc0403..000000000
--- a/tests/auto/unit/qmultimedia_common/mockrecorder.pri
+++ /dev/null
@@ -1,14 +0,0 @@
-INCLUDEPATH *= $$PWD \
-    ../../../src/multimedia \
-    ../../../src/multimedia/audio \
-    ../../../src/multimedia/video \
-
-HEADERS *= \
-    ../qmultimedia_common/mockmediarecorderservice.h \
-    ../qmultimedia_common/mockmediarecordercontrol.h \
-    ../qmultimedia_common/mockvideoencodercontrol.h \
-    ../qmultimedia_common/mockaudioencodercontrol.h \
-    ../qmultimedia_common/mockaudioprobecontrol.h \
-
-# We also need all the container/metadata bits
-include(mockcontainer.pri)
diff --git a/tests/auto/unit/qmultimedia_common/mockvideo.pri b/tests/auto/unit/qmultimedia_common/mockvideo.pri
deleted file mode 100644
index a2492298c..000000000
--- a/tests/auto/unit/qmultimedia_common/mockvideo.pri
+++ /dev/null
@@ -1,10 +0,0 @@
-# video related mock backend files
-INCLUDEPATH += $$PWD \
-    ../../../src/multimedia \
-    ../../../src/multimedia/video
-
-HEADERS *= \
-    ../qmultimedia_common/mockvideosurface.h \
-    ../qmultimedia_common/mockvideorenderercontrol.h \
-    ../qmultimedia_common/mockvideowindowcontrol.h
-
diff --git a/tests/auto/unit/qvideoprobe/CMakeLists.txt b/tests/auto/unit/qvideoprobe/CMakeLists.txt
deleted file mode 100644
index 8a823e786..000000000
--- a/tests/auto/unit/qvideoprobe/CMakeLists.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-# Generated from qvideoprobe.pro.
-
-#####################################################################
-## tst_qvideoprobe Test:
-#####################################################################
-
-qt_add_test(tst_qvideoprobe
-    SOURCES
-        ../qmultimedia_common/mockaudioencodercontrol.h
-        ../qmultimedia_common/mockaudioprobecontrol.h
-        ../qmultimedia_common/mockmediacontainercontrol.h
-        ../qmultimedia_common/mockmediaplayercontrol.h
-        ../qmultimedia_common/mockmediaplayerservice.h
-        ../qmultimedia_common/mockmediarecordercontrol.h
-        ../qmultimedia_common/mockmediarecorderservice.h
-        ../qmultimedia_common/mockmediaservice.h
-        ../qmultimedia_common/mockmediaserviceprovider.h
-        ../qmultimedia_common/mockmediasource.h
-        ../qmultimedia_common/mockmediastreamscontrol.h
-        ../qmultimedia_common/mockmetadatareadercontrol.h
-        ../qmultimedia_common/mockmetadatawritercontrol.h
-        ../qmultimedia_common/mockvideoencodercontrol.h
-        ../qmultimedia_common/mockvideoprobecontrol.h
-        ../qmultimedia_common/mockvideorenderercontrol.h
-        ../qmultimedia_common/mockvideosurface.h
-        ../qmultimedia_common/mockvideowindowcontrol.h
-        tst_qvideoprobe.cpp
-    INCLUDE_DIRECTORIES
-        ../../../../src/multimedia
-        ../../../src/multimedia ../../../src/multimedia
-        ../../../src/multimedia/audio
-        ../../../src/multimedia/video ../../../src/multimedia/video
-        ../qmultimedia_common ../qmultimedia_common
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::MultimediaPrivate
-)
diff --git a/tests/auto/unit/qvideoprobe/qvideoprobe.pro b/tests/auto/unit/qvideoprobe/qvideoprobe.pro
deleted file mode 100644
index 52fb9cde5..000000000
--- a/tests/auto/unit/qvideoprobe/qvideoprobe.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-CONFIG += testcase
-TARGET = tst_qvideoprobe
-
-QT += multimedia-private testlib
-
-SOURCES += tst_qvideoprobe.cpp
-
-include (../qmultimedia_common/mock.pri)
-include (../qmultimedia_common/mockrecorder.pri)
-include (../qmultimedia_common/mockplayer.pri)
diff --git a/tests/auto/unit/unit.pro b/tests/auto/unit/unit.pro
index 37f85209e..d5e9b2713 100644
--- a/tests/auto/unit/unit.pro
+++ b/tests/auto/unit/unit.pro
@@ -1,5 +1,6 @@
 TEMPLATE = subdirs
+CONFIG += ordered
 
-SUBDIRS += multimedia.pro
-qtHaveModule(widgets): SUBDIRS += multimediawidgets.pro
-qtHaveModule(qml): SUBDIRS += multimediaqml.pro
+SUBDIRS += mockbackend multimedia
+qtHaveModule(widgets): SUBDIRS += multimediawidgets
+qtHaveModule(qml): SUBDIRS += qml