Create Mediaservices lib, separate from Multimedia.

(cherry picked from commit e85223d233c0e1d6beca748332b8fbaba3ebbf2d)

18 files changed, 37 insertions, 31 deletions

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index c0004f7..12ebc75 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -16,6 +16,7 @@ unix:!embedded:contains(QT_CONFIG, dbus):   SUBDIRS += dbus.pro
 contains(QT_CONFIG, script):                SUBDIRS += script.pro
 contains(QT_CONFIG, webkit):                SUBDIRS += webkit.pro
 contains(QT_CONFIG, multimedia):            SUBDIRS += multimedia.pro
+contains(QT_CONFIG, mediaservices):         SUBDIRS += mediaservices.pro
 contains(QT_CONFIG, phonon):                SUBDIRS += phonon.pro
 contains(QT_CONFIG, svg):                   SUBDIRS += svg.pro
 contains(QT_CONFIG, declarative):           SUBDIRS += declarative.pro
diff --git a/tests/auto/mediaservices.pro b/tests/auto/mediaservices.pro
new file mode 100644
index 0000000..1b50cd7
--- /dev/null
+++ b/tests/auto/mediaservices.pro
@@ -0,0 +1,19 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+    qsoundeffect \
+    qdeclarativeaudio \
+    qdeclarativevideo \
+    qgraphicsvideoitem \
+    qmediacontent \
+    qmediaobject \
+    qmediaplayer \
+    qmediaplaylist \
+    qmediaplaylistnavigator \
+    qmediapluginloader \
+    qmediaresource \
+    qmediaservice \
+    qmediaserviceprovider \
+    qmediatimerange \
+    qvideowidget
+
+
diff --git a/tests/auto/multimedia.pro b/tests/auto/multimedia.pro
index f55d6e4..876b932 100644
--- a/tests/auto/multimedia.pro
+++ b/tests/auto/multimedia.pro
@@ -6,21 +6,7 @@ SUBDIRS=\
     qaudioformat \
     qaudioinput \
     qaudiooutput \
-    qsoundeffect \
-    qdeclarativeaudio \
-    qdeclarativevideo \
-    qgraphicsvideoitem \
-    qmediacontent \
-    qmediaobject \
-    qmediaplayer \
-    qmediaplaylist \
-    qmediaplaylistnavigator \
-    qmediapluginloader \
-    qmediaresource \
-    qmediaservice \
-    qmediaserviceprovider \
-    qmediatimerange \
     qvideoframe \
     qvideosurfaceformat \
-    qvideowidget \
+    qvideowidget
 
diff --git a/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro b/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro
index 7779efc..ecfe299 100644
--- a/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro
+++ b/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro
@@ -11,4 +11,4 @@ SOURCES += \
         $$PWD/../../../src/imports/multimedia/qdeclarativemediabase.cpp \
         $$PWD/../../../src/imports/multimedia/qmetadatacontrolmetaobject.cpp
 
-QT += multimedia declarative
+QT += mediaservices declarative
diff --git a/tests/auto/qdeclarativevideo/qdeclarativevideo.pro b/tests/auto/qdeclarativevideo/qdeclarativevideo.pro
index 4cd4c71..c2bcdfe 100644
--- a/tests/auto/qdeclarativevideo/qdeclarativevideo.pro
+++ b/tests/auto/qdeclarativevideo/qdeclarativevideo.pro
@@ -11,4 +11,4 @@ SOURCES += \
         $$PWD/../../../src/imports/multimedia/qdeclarativemediabase.cpp \
         $$PWD/../../../src/imports/multimedia/qmetadatacontrolmetaobject.cpp
 
-QT += multimedia declarative
+QT += mediaservices declarative
diff --git a/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro b/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro
index da00baf..60e1933 100644
--- a/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro
+++ b/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro
@@ -1,5 +1,5 @@
 load(qttest_p4)
 SOURCES += tst_qgraphicsvideoitem.cpp
 
-QT += multimedia
-requires(contains(QT_CONFIG, multimedia))
+QT += mediaservices
+requires(contains(QT_CONFIG, mediaservices))
diff --git a/tests/auto/qmediacontent/qmediacontent.pro b/tests/auto/qmediacontent/qmediacontent.pro
index 6c13c8b..e20b4db 100644
--- a/tests/auto/qmediacontent/qmediacontent.pro
+++ b/tests/auto/qmediacontent/qmediacontent.pro
@@ -2,5 +2,5 @@ load(qttest_p4)
 
 SOURCES += tst_qmediacontent.cpp
 
-QT = core network multimedia
+QT = core network mediaservices
 
diff --git a/tests/auto/qmediaobject/qmediaobject.pro b/tests/auto/qmediaobject/qmediaobject.pro
index e59bfdc..d6a0f7b 100644
--- a/tests/auto/qmediaobject/qmediaobject.pro
+++ b/tests/auto/qmediaobject/qmediaobject.pro
@@ -1,4 +1,4 @@
 load(qttest_p4)
 
 SOURCES += tst_qmediaobject.cpp
-QT = core multimedia
+QT = core mediaservices
diff --git a/tests/auto/qmediaplayer/qmediaplayer.pro b/tests/auto/qmediaplayer/qmediaplayer.pro
index 21008f9..f355078 100644
--- a/tests/auto/qmediaplayer/qmediaplayer.pro
+++ b/tests/auto/qmediaplayer/qmediaplayer.pro
@@ -2,5 +2,5 @@ load(qttest_p4)
 
 SOURCES += tst_qmediaplayer.cpp
 
-QT = core multimedia
+QT = core mediaservices
 
diff --git a/tests/auto/qmediaplaylist/qmediaplaylist.pro b/tests/auto/qmediaplaylist/qmediaplaylist.pro
index b114bda..809473b 100644
--- a/tests/auto/qmediaplaylist/qmediaplaylist.pro
+++ b/tests/auto/qmediaplaylist/qmediaplaylist.pro
@@ -2,5 +2,5 @@ load(qttest_p4)
 
 SOURCES = tst_qmediaplaylist.cpp
 
-QT = core multimedia
+QT = core mediaservices
 
diff --git a/tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro b/tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro
index ea9bc0f..3265762 100644
--- a/tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro
+++ b/tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro
@@ -2,5 +2,5 @@ load(qttest_p4)
 
 SOURCES = tst_qmediaplaylistnavigator.cpp
 
-QT = core multimedia
+QT = core mediaservices
 
diff --git a/tests/auto/qmediapluginloader/qmediapluginloader.pro b/tests/auto/qmediapluginloader/qmediapluginloader.pro
index 66950e9..a47cc57 100644
--- a/tests/auto/qmediapluginloader/qmediapluginloader.pro
+++ b/tests/auto/qmediapluginloader/qmediapluginloader.pro
@@ -2,5 +2,5 @@ load(qttest_p4)
 
 SOURCES = tst_qmediapluginloader.cpp
 
-QT = core multimedia
+QT = core mediaservices
 
diff --git a/tests/auto/qmediaresource/qmediaresource.pro b/tests/auto/qmediaresource/qmediaresource.pro
index c8e3d9c..64669a2 100644
--- a/tests/auto/qmediaresource/qmediaresource.pro
+++ b/tests/auto/qmediaresource/qmediaresource.pro
@@ -2,5 +2,5 @@ load(qttest_p4)
 
 SOURCES = tst_qmediaresource.cpp
 
-QT = core multimedia network
+QT = core mediaservices network
 
diff --git a/tests/auto/qmediaservice/qmediaservice.pro b/tests/auto/qmediaservice/qmediaservice.pro
index f877665..8acd03a 100644
--- a/tests/auto/qmediaservice/qmediaservice.pro
+++ b/tests/auto/qmediaservice/qmediaservice.pro
@@ -2,5 +2,5 @@ load(qttest_p4)
 
 SOURCES = tst_qmediaservice.cpp
 
-QT = core gui multimedia
+QT = core gui mediaservices
 
diff --git a/tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro b/tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro
index 9aaa9e5..69b3864 100644
--- a/tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro
+++ b/tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro
@@ -2,5 +2,5 @@ load(qttest_p4)
 
 SOURCES = tst_qmediaserviceprovider.cpp
 
-QT = core gui multimedia
+QT = core gui mediaservices
 
diff --git a/tests/auto/qmediatimerange/qmediatimerange.pro b/tests/auto/qmediatimerange/qmediatimerange.pro
index b1b436e..98c415b 100644
--- a/tests/auto/qmediatimerange/qmediatimerange.pro
+++ b/tests/auto/qmediatimerange/qmediatimerange.pro
@@ -2,5 +2,5 @@ load(qttest_p4)
 
 SOURCES = tst_qmediatimerange.cpp
 
-QT = core multimedia
+QT = core media 
 
diff --git a/tests/auto/qsoundeffect/qsoundeffect.pro b/tests/auto/qsoundeffect/qsoundeffect.pro
index eaa35b2..4ed7407 100644
--- a/tests/auto/qsoundeffect/qsoundeffect.pro
+++ b/tests/auto/qsoundeffect/qsoundeffect.pro
@@ -2,7 +2,7 @@ load(qttest_p4)
 
 SOURCES += tst_qsoundeffect.cpp
 
-QT = core multimedia
+QT = core media
 
 wince* {
     deploy.sources += 4.wav
diff --git a/tests/auto/qvideowidget/qvideowidget.pro b/tests/auto/qvideowidget/qvideowidget.pro
index ca0fc24..fde9030 100644
--- a/tests/auto/qvideowidget/qvideowidget.pro
+++ b/tests/auto/qvideowidget/qvideowidget.pro
@@ -2,5 +2,5 @@ load(qttest_p4)
 
 SOURCES = tst_qvideowidget.cpp
 
-QT = core gui multimedia
+QT = core gui media