Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/plugins/avfoundation/mediaplayer/mediaplayer.pro
	tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro
	tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro
	tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro
	tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro
	tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro

Change-Id: I5742596230dc510ba2a09eba624429bb67179194

18 files changed, 48 insertions, 54 deletions

diff --git a/tests/auto/unit/qaudiodecoder/qaudiodecoder.pro b/tests/auto/unit/qaudiodecoder/qaudiodecoder.pro
index 21204847c..4534fb4fe 100644
--- a/tests/auto/unit/qaudiodecoder/qaudiodecoder.pro
+++ b/tests/auto/unit/qaudiodecoder/qaudiodecoder.pro
@@ -1,14 +1,8 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2012-02-07T15:27:07
-#
-#-------------------------------------------------
-
 QT += multimedia multimedia-private testlib gui
 
 TARGET = tst_qaudiodecoder
 
-CONFIG += testcase no_private_qt_headers_warning
+CONFIG += testcase
 
 TEMPLATE = app
 
diff --git a/tests/auto/unit/qaudioprobe/qaudioprobe.pro b/tests/auto/unit/qaudioprobe/qaudioprobe.pro
index 3d275b402..a83769cc7 100644
--- a/tests/auto/unit/qaudioprobe/qaudioprobe.pro
+++ b/tests/auto/unit/qaudioprobe/qaudioprobe.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase no_private_qt_headers_warning
+CONFIG += testcase
 TARGET = tst_qaudioprobe
 
 QT += multimedia-private testlib
diff --git a/tests/auto/unit/qaudiorecorder/qaudiorecorder.pro b/tests/auto/unit/qaudiorecorder/qaudiorecorder.pro
index ccb5531e7..a40fba233 100644
--- a/tests/auto/unit/qaudiorecorder/qaudiorecorder.pro
+++ b/tests/auto/unit/qaudiorecorder/qaudiorecorder.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase no_private_qt_headers_warning
+CONFIG += testcase
 TARGET = tst_qaudiorecorder
 
 QT += multimedia-private testlib
diff --git a/tests/auto/unit/qmediaobject/qmediaobject.pro b/tests/auto/unit/qmediaobject/qmediaobject.pro
index 71a22ee62..26c9f1223 100644
--- a/tests/auto/unit/qmediaobject/qmediaobject.pro
+++ b/tests/auto/unit/qmediaobject/qmediaobject.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase no_private_qt_headers_warning
+CONFIG += testcase
 TARGET = tst_qmediaobject
 QT += multimedia-private testlib
 
diff --git a/tests/auto/unit/qmediaplayer/qmediaplayer.pro b/tests/auto/unit/qmediaplayer/qmediaplayer.pro
index da52f081d..7279239e0 100644
--- a/tests/auto/unit/qmediaplayer/qmediaplayer.pro
+++ b/tests/auto/unit/qmediaplayer/qmediaplayer.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase no_private_qt_headers_warning
+CONFIG += testcase
 TARGET = tst_qmediaplayer
 QT += network multimedia-private testlib
 SOURCES += tst_qmediaplayer.cpp
diff --git a/tests/auto/unit/qmediaplayerwidgets/qmediaplayerwidgets.pro b/tests/auto/unit/qmediaplayerwidgets/qmediaplayerwidgets.pro
index 97232f934..60c4f25f4 100644
--- a/tests/auto/unit/qmediaplayerwidgets/qmediaplayerwidgets.pro
+++ b/tests/auto/unit/qmediaplayerwidgets/qmediaplayerwidgets.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase no_private_qt_headers_warning
+CONFIG += testcase
 TARGET = tst_qmediaplayerwidgets
 QT += network multimedia-private multimediawidgets-private testlib widgets
 SOURCES += tst_qmediaplayerwidgets.cpp
diff --git a/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp b/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp
index c43f69886..3a59823ca 100644
--- a/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp
+++ b/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp
@@ -1218,7 +1218,7 @@ void tst_QMediaPlaylist::mediaPlayListControl()
 {
     // To check changes in abstract classe's pure virtual functions
     QObject parent;
-    MockMediaPlaylistControl plylistctrl(&parent);
+    MockMediaPlaylistControl plylistctrl(false, &parent);
 }
 
 // MaemoAPI-1850:test QMediaPlayListSourceControl constructor
diff --git a/tests/auto/unit/qmediarecorder/qmediarecorder.pro b/tests/auto/unit/qmediarecorder/qmediarecorder.pro
index 417ba17d2..7103ea157 100644
--- a/tests/auto/unit/qmediarecorder/qmediarecorder.pro
+++ b/tests/auto/unit/qmediarecorder/qmediarecorder.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase no_private_qt_headers_warning
+CONFIG += testcase
 TARGET = tst_qmediarecorder
 QT += multimedia-private testlib
 SOURCES += tst_qmediarecorder.cpp
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro
index c17f5c3d6..7fcaadbc2 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro
@@ -1,7 +1,12 @@
-TARGET = mockserviceplugin1
 QT += multimedia-private
 
-PLUGIN_TYPE=mediaservice
+HEADERS += ../mockservice.h
+SOURCES += mockserviceplugin1.cpp
+OTHER_FILES += mockserviceplugin1.json
+
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+
+PLUGIN_TYPE = mediaservice
 PLUGIN_CLASS_NAME = MockServicePlugin1
 load(qt_plugin)
 
@@ -14,9 +19,4 @@ win32 {
     }
 }
 
-HEADERS += ../mockservice.h
-SOURCES += mockserviceplugin1.cpp
-OTHER_FILES += mockserviceplugin1.json
-
 target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE}
-
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro
index 21c78790e..4ac001ec9 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro
@@ -1,7 +1,12 @@
-TARGET = mockserviceplugin2
 QT += multimedia-private
 
-PLUGIN_TYPE=mediaservice
+HEADERS += ../mockservice.h
+SOURCES += mockserviceplugin2.cpp
+OTHER_FILES += mockserviceplugin2.json
+
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+
+PLUGIN_TYPE = mediaservice
 PLUGIN_CLASS_NAME = MockServicePlugin2
 load(qt_plugin)
 
@@ -14,9 +19,4 @@ win32 {
     }
 }
 
-HEADERS += ../mockservice.h
-SOURCES += mockserviceplugin2.cpp
-OTHER_FILES += mockserviceplugin2.json
-
 target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE}
-
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro
index 4e516a095..34cd2fed1 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro
@@ -1,7 +1,12 @@
-TARGET = mockserviceplugin3
 QT += multimedia-private
 
-PLUGIN_TYPE=mediaservice
+HEADERS += ../mockservice.h
+SOURCES += mockserviceplugin3.cpp
+OTHER_FILES += mockserviceplugin3.json
+
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+
+PLUGIN_TYPE = mediaservice
 PLUGIN_CLASS_NAME = MockServicePlugin3
 load(qt_plugin)
 
@@ -14,9 +19,4 @@ win32 {
     }
 }
 
-HEADERS += ../mockservice.h
-SOURCES += mockserviceplugin3.cpp
-OTHER_FILES += mockserviceplugin3.json
-
 target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE}
-
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro
index 3446e2456..0900bfc40 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro
@@ -1,7 +1,12 @@
-TARGET = mockserviceplugin4
 QT += multimedia-private
 
-PLUGIN_TYPE=mediaservice
+HEADERS += ../mockservice.h
+SOURCES += mockserviceplugin4.cpp
+OTHER_FILES += mockserviceplugin4.json
+
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+
+PLUGIN_TYPE = mediaservice
 PLUGIN_CLASS_NAME = MockServicePlugin4
 load(qt_plugin)
 
@@ -14,9 +19,4 @@ win32 {
     }
 }
 
-HEADERS += ../mockservice.h
-SOURCES += mockserviceplugin4.cpp
-OTHER_FILES += mockserviceplugin4.json
-
 target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE}
-
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro
index 2358fa503..37f287f9d 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro
@@ -1,7 +1,12 @@
-TARGET = mockserviceplugin5
 QT += multimedia-private
 
-PLUGIN_TYPE=mediaservice
+HEADERS += ../mockservice.h
+SOURCES += mockserviceplugin5.cpp
+OTHER_FILES += mockserviceplugin5.json
+
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+
+PLUGIN_TYPE = mediaservice
 PLUGIN_CLASS_NAME = MockServicePlugin5
 load(qt_plugin)
 
@@ -14,9 +19,4 @@ win32 {
     }
 }
 
-HEADERS += ../mockservice.h
-SOURCES += mockserviceplugin5.cpp
-OTHER_FILES += mockserviceplugin5.json
-
 target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE}
-
diff --git a/tests/auto/unit/qradiodata/qradiodata.pro b/tests/auto/unit/qradiodata/qradiodata.pro
index b8914c222..b08262d70 100644
--- a/tests/auto/unit/qradiodata/qradiodata.pro
+++ b/tests/auto/unit/qradiodata/qradiodata.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase no_private_qt_headers_warning
+CONFIG += testcase
 TARGET = tst_qradiodata
 QT += multimedia-private testlib
 SOURCES += tst_qradiodata.cpp
diff --git a/tests/auto/unit/qradiotuner/qradiotuner.pro b/tests/auto/unit/qradiotuner/qradiotuner.pro
index 4298110d7..d15c4c6a2 100644
--- a/tests/auto/unit/qradiotuner/qradiotuner.pro
+++ b/tests/auto/unit/qradiotuner/qradiotuner.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase no_private_qt_headers_warning
+CONFIG += testcase
 TARGET = tst_qradiotuner
 QT += multimedia-private testlib
 SOURCES += tst_qradiotuner.cpp
diff --git a/tests/auto/unit/qsamplecache/qsamplecache.pro b/tests/auto/unit/qsamplecache/qsamplecache.pro
index c17c15919..02ca7cb18 100644
--- a/tests/auto/unit/qsamplecache/qsamplecache.pro
+++ b/tests/auto/unit/qsamplecache/qsamplecache.pro
@@ -1,4 +1,4 @@
-CONFIG += no_private_qt_headers_warning testcase
+CONFIG += testcase
 TARGET = tst_qsamplecache
 
 QT += multimedia-private testlib
diff --git a/tests/auto/unit/qvideoprobe/qvideoprobe.pro b/tests/auto/unit/qvideoprobe/qvideoprobe.pro
index 03c7d56f7..52fb9cde5 100644
--- a/tests/auto/unit/qvideoprobe/qvideoprobe.pro
+++ b/tests/auto/unit/qvideoprobe/qvideoprobe.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase no_private_qt_headers_warning
+CONFIG += testcase
 TARGET = tst_qvideoprobe
 
 QT += multimedia-private testlib
diff --git a/tests/auto/unit/qwavedecoder/qwavedecoder.pro b/tests/auto/unit/qwavedecoder/qwavedecoder.pro
index 39ebaf63e..1409df98b 100644
--- a/tests/auto/unit/qwavedecoder/qwavedecoder.pro
+++ b/tests/auto/unit/qwavedecoder/qwavedecoder.pro
@@ -4,6 +4,6 @@ SOURCES += tst_qwavedecoder.cpp \
            ../../../../src/multimedia/audio/qwavedecoder_p.cpp
 
 QT += multimedia-private testlib network
-CONFIG += no_private_qt_headers_warning testcase
+CONFIG += testcase
 
 TESTDATA += data/*