summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-08-24 16:28:06 +0200
committerYoann Lopes <yoann.lopes@theqtcompany.com>2015-08-24 14:45:45 +0000
commit20641814051802d285d6000e054e2eb92e9218f4 (patch)
tree4a21cb45cf8b000b2eeae1d7fa73db4327189ccd /tests/auto
parent23acd9f01d5dcca84025eb95de266e7e6b6cb386 (diff)
Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests.
There was only one test actually using the deprecated WaitForWindowShown(). Replace by qWaitForWindowExposed() and remove define. Change-Id: I2e71edca8f8be26c9a63b6a9d1fa30b31979c1fe Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/integration/qaudiodecoderbackend/qaudiodecoderbackend.pro1
-rw-r--r--tests/auto/integration/qaudiodeviceinfo/qaudiodeviceinfo.pro1
-rw-r--r--tests/auto/integration/qaudioinput/qaudioinput.pro1
-rw-r--r--tests/auto/integration/qaudiooutput/qaudiooutput.pro1
-rw-r--r--tests/auto/integration/qcamerabackend/qcamerabackend.pro1
-rw-r--r--tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro1
-rw-r--r--tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro1
-rw-r--r--tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro1
-rw-r--r--tests/auto/integration/qml/qml.pro1
-rw-r--r--tests/auto/integration/qsound/qsound.pro1
-rw-r--r--tests/auto/integration/qsoundeffect/qsoundeffect.pro1
-rw-r--r--tests/auto/unit/qabstractvideobuffer/qabstractvideobuffer.pro1
-rw-r--r--tests/auto/unit/qabstractvideosurface/qabstractvideosurface.pro1
-rw-r--r--tests/auto/unit/qaudiobuffer/qaudiobuffer.pro1
-rw-r--r--tests/auto/unit/qaudiodecoder/qaudiodecoder.pro1
-rw-r--r--tests/auto/unit/qaudioformat/qaudioformat.pro1
-rw-r--r--tests/auto/unit/qaudionamespace/qaudionamespace.pro1
-rw-r--r--tests/auto/unit/qaudioprobe/qaudioprobe.pro1
-rw-r--r--tests/auto/unit/qaudiorecorder/qaudiorecorder.pro1
-rw-r--r--tests/auto/unit/qcamera/qcamera.pro1
-rw-r--r--tests/auto/unit/qcameraimagecapture/qcameraimagecapture.pro1
-rw-r--r--tests/auto/unit/qcamerainfo/qcamerainfo.pro1
-rw-r--r--tests/auto/unit/qcameraviewfinder/qcameraviewfinder.pro1
-rw-r--r--tests/auto/unit/qcamerawidgets/qcamerawidgets.pro1
-rw-r--r--tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro1
-rw-r--r--tests/auto/unit/qdeclarativecamera/qdeclarativecamera.pro1
-rw-r--r--tests/auto/unit/qdeclarativemultimediaglobal/qdeclarativemultimediaglobal.pro1
-rw-r--r--tests/auto/unit/qgraphicsvideoitem/qgraphicsvideoitem.pro1
-rw-r--r--tests/auto/unit/qmediabindableinterface/qmediabindableinterface.pro1
-rw-r--r--tests/auto/unit/qmediacontainercontrol/qmediacontainercontrol.pro1
-rw-r--r--tests/auto/unit/qmediacontent/qmediacontent.pro1
-rw-r--r--tests/auto/unit/qmediaobject/qmediaobject.pro1
-rw-r--r--tests/auto/unit/qmediaplayer/qmediaplayer.pro1
-rw-r--r--tests/auto/unit/qmediaplayerwidgets/qmediaplayerwidgets.pro1
-rw-r--r--tests/auto/unit/qmediaplaylist/qmediaplaylist.pro1
-rw-r--r--tests/auto/unit/qmediaplaylistnavigator/qmediaplaylistnavigator.pro1
-rw-r--r--tests/auto/unit/qmediapluginloader/qmediapluginloader.pro1
-rw-r--r--tests/auto/unit/qmediarecorder/qmediarecorder.pro1
-rw-r--r--tests/auto/unit/qmediaresource/qmediaresource.pro1
-rw-r--r--tests/auto/unit/qmediaservice/qmediaservice.pro1
-rw-r--r--tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro1
-rw-r--r--tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro1
-rw-r--r--tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro1
-rw-r--r--tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro1
-rw-r--r--tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro1
-rw-r--r--tests/auto/unit/qmediaserviceprovider/test/test.pro1
-rw-r--r--tests/auto/unit/qmediatimerange/qmediatimerange.pro1
-rw-r--r--tests/auto/unit/qmetadatareadercontrol/qmetadatareadercontrol.pro1
-rw-r--r--tests/auto/unit/qmetadatawritercontrol/qmetadatawritercontrol.pro1
-rw-r--r--tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro1
-rw-r--r--tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp12
-rw-r--r--tests/auto/unit/qradiodata/qradiodata.pro1
-rw-r--r--tests/auto/unit/qradiotuner/qradiotuner.pro1
-rw-r--r--tests/auto/unit/qsamplecache/qsamplecache.pro1
-rw-r--r--tests/auto/unit/qvideoencodersettingscontrol/qvideoencodersettingscontrol.pro1
-rw-r--r--tests/auto/unit/qvideoframe/qvideoframe.pro1
-rw-r--r--tests/auto/unit/qvideoprobe/qvideoprobe.pro1
-rw-r--r--tests/auto/unit/qvideosurfaceformat/qvideosurfaceformat.pro1
-rw-r--r--tests/auto/unit/qvideowidget/qvideowidget.pro1
-rw-r--r--tests/auto/unit/qwavedecoder/qwavedecoder.pro1
60 files changed, 6 insertions, 65 deletions
diff --git a/tests/auto/integration/qaudiodecoderbackend/qaudiodecoderbackend.pro b/tests/auto/integration/qaudiodecoderbackend/qaudiodecoderbackend.pro
index c9f5a089c..7464a8aa2 100644
--- a/tests/auto/integration/qaudiodecoderbackend/qaudiodecoderbackend.pro
+++ b/tests/auto/integration/qaudiodecoderbackend/qaudiodecoderbackend.pro
@@ -11,4 +11,3 @@ INCLUDEPATH += \
SOURCES += \
tst_qaudiodecoderbackend.cpp
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/integration/qaudiodeviceinfo/qaudiodeviceinfo.pro b/tests/auto/integration/qaudiodeviceinfo/qaudiodeviceinfo.pro
index 98ed7e69c..3eb0905c7 100644
--- a/tests/auto/integration/qaudiodeviceinfo/qaudiodeviceinfo.pro
+++ b/tests/auto/integration/qaudiodeviceinfo/qaudiodeviceinfo.pro
@@ -7,4 +7,3 @@ CONFIG += testcase
SOURCES += tst_qaudiodeviceinfo.cpp
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/integration/qaudioinput/qaudioinput.pro b/tests/auto/integration/qaudioinput/qaudioinput.pro
index a3e0ad31a..737ff6c23 100644
--- a/tests/auto/integration/qaudioinput/qaudioinput.pro
+++ b/tests/auto/integration/qaudioinput/qaudioinput.pro
@@ -7,4 +7,3 @@ CONFIG += testcase insignificant_test
HEADERS += wavheader.h
SOURCES += wavheader.cpp tst_qaudioinput.cpp
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/integration/qaudiooutput/qaudiooutput.pro b/tests/auto/integration/qaudiooutput/qaudiooutput.pro
index 5933e7368..bfc9a3b1c 100644
--- a/tests/auto/integration/qaudiooutput/qaudiooutput.pro
+++ b/tests/auto/integration/qaudiooutput/qaudiooutput.pro
@@ -9,4 +9,3 @@ HEADERS += wavheader.h
SOURCES += wavheader.cpp tst_qaudiooutput.cpp
mac: CONFIG += insignificant_test
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/integration/qcamerabackend/qcamerabackend.pro b/tests/auto/integration/qcamerabackend/qcamerabackend.pro
index b19c52abe..b5f079008 100644
--- a/tests/auto/integration/qcamerabackend/qcamerabackend.pro
+++ b/tests/auto/integration/qcamerabackend/qcamerabackend.pro
@@ -7,5 +7,4 @@ QT += multimedia-private widgets testlib
CONFIG += testcase
SOURCES += tst_qcamerabackend.cpp
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro b/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro
index 573e5559e..e68e87f79 100644
--- a/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro
+++ b/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro
@@ -7,4 +7,3 @@ SOURCES += \
tst_qdeclarativevideooutput.cpp
INCLUDEPATH += ../../../../src/imports/multimedia
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro b/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro
index 655fbc7b9..7c1608671 100644
--- a/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro
+++ b/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro
@@ -7,6 +7,5 @@ SOURCES += \
tst_qdeclarativevideooutput_window.cpp
INCLUDEPATH += ../../../../src/imports/multimedia
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
win32:contains(QT_CONFIG, angle): CONFIG += insignificant_test # QTBUG-28541
diff --git a/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro b/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro
index a2c1bdf87..87637fadc 100644
--- a/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro
+++ b/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro
@@ -10,4 +10,3 @@ SOURCES += \
tst_qmediaplayerbackend.cpp
TESTDATA += testdata/*
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/integration/qml/qml.pro b/tests/auto/integration/qml/qml.pro
index cd02af680..c0015d9bd 100644
--- a/tests/auto/integration/qml/qml.pro
+++ b/tests/auto/integration/qml/qml.pro
@@ -8,4 +8,3 @@ importFiles.files = soundeffect
importFiles.path = .
DEPLOYMENT += importFiles
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/integration/qsound/qsound.pro b/tests/auto/integration/qsound/qsound.pro
index e2d4434e9..49f5fda1d 100644
--- a/tests/auto/integration/qsound/qsound.pro
+++ b/tests/auto/integration/qsound/qsound.pro
@@ -10,4 +10,3 @@ SOURCES += tst_qsound.cpp
TESTDATA += test.wav
win32: CONFIG += insignificant_test
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/integration/qsoundeffect/qsoundeffect.pro b/tests/auto/integration/qsoundeffect/qsoundeffect.pro
index bce5fc77a..7a0f63e4b 100644
--- a/tests/auto/integration/qsoundeffect/qsoundeffect.pro
+++ b/tests/auto/integration/qsoundeffect/qsoundeffect.pro
@@ -15,6 +15,5 @@ unix:!mac {
TESTDATA += test.wav
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
config_pulseaudio: CONFIG += insignificant_testcase # Crashes in QSoundEffectPrivate::sampleReady with bufferAttr == 0
diff --git a/tests/auto/unit/qabstractvideobuffer/qabstractvideobuffer.pro b/tests/auto/unit/qabstractvideobuffer/qabstractvideobuffer.pro
index dc449358c..f97ea41c3 100644
--- a/tests/auto/unit/qabstractvideobuffer/qabstractvideobuffer.pro
+++ b/tests/auto/unit/qabstractvideobuffer/qabstractvideobuffer.pro
@@ -5,4 +5,3 @@ QT += core multimedia-private testlib
SOURCES += tst_qabstractvideobuffer.cpp
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qabstractvideosurface/qabstractvideosurface.pro b/tests/auto/unit/qabstractvideosurface/qabstractvideosurface.pro
index 62e4c60da..1f2e47d59 100644
--- a/tests/auto/unit/qabstractvideosurface/qabstractvideosurface.pro
+++ b/tests/auto/unit/qabstractvideosurface/qabstractvideosurface.pro
@@ -5,4 +5,3 @@ QT += core multimedia-private testlib
SOURCES += tst_qabstractvideosurface.cpp
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qaudiobuffer/qaudiobuffer.pro b/tests/auto/unit/qaudiobuffer/qaudiobuffer.pro
index cd3b42f50..2da74b8c7 100644
--- a/tests/auto/unit/qaudiobuffer/qaudiobuffer.pro
+++ b/tests/auto/unit/qaudiobuffer/qaudiobuffer.pro
@@ -14,4 +14,3 @@ CONFIG -= app_bundle
TEMPLATE = app
SOURCES += tst_qaudiobuffer.cpp
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qaudiodecoder/qaudiodecoder.pro b/tests/auto/unit/qaudiodecoder/qaudiodecoder.pro
index ff9ba8f05..21204847c 100644
--- a/tests/auto/unit/qaudiodecoder/qaudiodecoder.pro
+++ b/tests/auto/unit/qaudiodecoder/qaudiodecoder.pro
@@ -19,4 +19,3 @@ include (../qmultimedia_common/mock.pri)
include (../qmultimedia_common/mockdecoder.pri)
SOURCES += tst_qaudiodecoder.cpp
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qaudioformat/qaudioformat.pro b/tests/auto/unit/qaudioformat/qaudioformat.pro
index 40ef06b51..408200a85 100644
--- a/tests/auto/unit/qaudioformat/qaudioformat.pro
+++ b/tests/auto/unit/qaudioformat/qaudioformat.pro
@@ -5,4 +5,3 @@ QT += core multimedia-private testlib
SOURCES += tst_qaudioformat.cpp
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qaudionamespace/qaudionamespace.pro b/tests/auto/unit/qaudionamespace/qaudionamespace.pro
index 78e99dd5d..cfe502dc6 100644
--- a/tests/auto/unit/qaudionamespace/qaudionamespace.pro
+++ b/tests/auto/unit/qaudionamespace/qaudionamespace.pro
@@ -5,4 +5,3 @@ QT += core multimedia-private testlib
SOURCES += tst_qaudionamespace.cpp
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qaudioprobe/qaudioprobe.pro b/tests/auto/unit/qaudioprobe/qaudioprobe.pro
index fe2000716..3d275b402 100644
--- a/tests/auto/unit/qaudioprobe/qaudioprobe.pro
+++ b/tests/auto/unit/qaudioprobe/qaudioprobe.pro
@@ -8,4 +8,3 @@ SOURCES += tst_qaudioprobe.cpp
include (../qmultimedia_common/mock.pri)
include (../qmultimedia_common/mockrecorder.pri)
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qaudiorecorder/qaudiorecorder.pro b/tests/auto/unit/qaudiorecorder/qaudiorecorder.pro
index 7ee5222c6..ccb5531e7 100644
--- a/tests/auto/unit/qaudiorecorder/qaudiorecorder.pro
+++ b/tests/auto/unit/qaudiorecorder/qaudiorecorder.pro
@@ -8,4 +8,3 @@ SOURCES += tst_qaudiorecorder.cpp
include (../qmultimedia_common/mock.pri)
include (../qmultimedia_common/mockrecorder.pri)
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qcamera/qcamera.pro b/tests/auto/unit/qcamera/qcamera.pro
index 1f31c7f1f..baca79829 100644
--- a/tests/auto/unit/qcamera/qcamera.pro
+++ b/tests/auto/unit/qcamera/qcamera.pro
@@ -7,4 +7,3 @@ include (../qmultimedia_common/mock.pri)
include (../qmultimedia_common/mockcamera.pri)
SOURCES += tst_qcamera.cpp
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qcameraimagecapture/qcameraimagecapture.pro b/tests/auto/unit/qcameraimagecapture/qcameraimagecapture.pro
index e6b43e166..ae92c2d04 100644
--- a/tests/auto/unit/qcameraimagecapture/qcameraimagecapture.pro
+++ b/tests/auto/unit/qcameraimagecapture/qcameraimagecapture.pro
@@ -8,4 +8,3 @@ SOURCES += \
include (../qmultimedia_common/mock.pri)
include (../qmultimedia_common/mockcamera.pri)
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qcamerainfo/qcamerainfo.pro b/tests/auto/unit/qcamerainfo/qcamerainfo.pro
index 70cea2ded..42d8e714e 100644
--- a/tests/auto/unit/qcamerainfo/qcamerainfo.pro
+++ b/tests/auto/unit/qcamerainfo/qcamerainfo.pro
@@ -7,4 +7,3 @@ include (../qmultimedia_common/mock.pri)
include (../qmultimedia_common/mockcamera.pri)
SOURCES += tst_qcamerainfo.cpp
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qcameraviewfinder/qcameraviewfinder.pro b/tests/auto/unit/qcameraviewfinder/qcameraviewfinder.pro
index 6f6aba04a..f9016febe 100644
--- a/tests/auto/unit/qcameraviewfinder/qcameraviewfinder.pro
+++ b/tests/auto/unit/qcameraviewfinder/qcameraviewfinder.pro
@@ -8,4 +8,3 @@ include (../qmultimedia_common/mockcamera.pri)
SOURCES += tst_qcameraviewfinder.cpp
QT+=widgets
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qcamerawidgets/qcamerawidgets.pro b/tests/auto/unit/qcamerawidgets/qcamerawidgets.pro
index dbab97ab3..c87144e94 100644
--- a/tests/auto/unit/qcamerawidgets/qcamerawidgets.pro
+++ b/tests/auto/unit/qcamerawidgets/qcamerawidgets.pro
@@ -9,4 +9,3 @@ include (../qmultimedia_common/mockcamera.pri)
SOURCES += tst_qcamerawidgets.cpp
QT+=widgets
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro b/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro
index e36c7dc1f..2bed926b9 100644
--- a/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro
+++ b/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro
@@ -12,7 +12,6 @@ SOURCES += \
../../../../src/imports/multimedia/qdeclarativeaudio.cpp
INCLUDEPATH += ../../../../src/imports/multimedia
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
include (../qmultimedia_common/mock.pri)
include (../qmultimedia_common/mockplayer.pri)
diff --git a/tests/auto/unit/qdeclarativecamera/qdeclarativecamera.pro b/tests/auto/unit/qdeclarativecamera/qdeclarativecamera.pro
index 08e95e72d..4e58f2293 100644
--- a/tests/auto/unit/qdeclarativecamera/qdeclarativecamera.pro
+++ b/tests/auto/unit/qdeclarativecamera/qdeclarativecamera.pro
@@ -9,7 +9,6 @@ include (../qmultimedia_common/mockcamera.pri)
SOURCES += \
tst_qdeclarativecamera.cpp
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
OTHER_FILES += \
tst_qdeclarativecamera.qml
diff --git a/tests/auto/unit/qdeclarativemultimediaglobal/qdeclarativemultimediaglobal.pro b/tests/auto/unit/qdeclarativemultimediaglobal/qdeclarativemultimediaglobal.pro
index 62e19e0d2..f806b054b 100644
--- a/tests/auto/unit/qdeclarativemultimediaglobal/qdeclarativemultimediaglobal.pro
+++ b/tests/auto/unit/qdeclarativemultimediaglobal/qdeclarativemultimediaglobal.pro
@@ -9,7 +9,6 @@ include (../qmultimedia_common/mockcamera.pri)
SOURCES += \
tst_qdeclarativemultimediaglobal.cpp
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
OTHER_FILES += \
tst_qdeclarativemultimediaglobal.qml
diff --git a/tests/auto/unit/qgraphicsvideoitem/qgraphicsvideoitem.pro b/tests/auto/unit/qgraphicsvideoitem/qgraphicsvideoitem.pro
index ebbac5b6e..27d0ff9a4 100644
--- a/tests/auto/unit/qgraphicsvideoitem/qgraphicsvideoitem.pro
+++ b/tests/auto/unit/qgraphicsvideoitem/qgraphicsvideoitem.pro
@@ -6,4 +6,3 @@ QT += multimedia-private multimediawidgets-private testlib
SOURCES += tst_qgraphicsvideoitem.cpp
QT+=widgets
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qmediabindableinterface/qmediabindableinterface.pro b/tests/auto/unit/qmediabindableinterface/qmediabindableinterface.pro
index 0e269c1d1..98dd0eca7 100644
--- a/tests/auto/unit/qmediabindableinterface/qmediabindableinterface.pro
+++ b/tests/auto/unit/qmediabindableinterface/qmediabindableinterface.pro
@@ -8,4 +8,3 @@ SOURCES += \
include (../qmultimedia_common/mock.pri)
include (../qmultimedia_common/mockrecorder.pri)
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qmediacontainercontrol/qmediacontainercontrol.pro b/tests/auto/unit/qmediacontainercontrol/qmediacontainercontrol.pro
index 32b6276e9..e13aab7c9 100644
--- a/tests/auto/unit/qmediacontainercontrol/qmediacontainercontrol.pro
+++ b/tests/auto/unit/qmediacontainercontrol/qmediacontainercontrol.pro
@@ -7,4 +7,3 @@ SOURCES += tst_qmediacontainercontrol.cpp
include (../qmultimedia_common/mockcontainer.pri)
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qmediacontent/qmediacontent.pro b/tests/auto/unit/qmediacontent/qmediacontent.pro
index 56e0e055a..d3ae1f7a5 100644
--- a/tests/auto/unit/qmediacontent/qmediacontent.pro
+++ b/tests/auto/unit/qmediacontent/qmediacontent.pro
@@ -4,4 +4,3 @@ TARGET = tst_qmediacontent
QT += multimedia-private network testlib
SOURCES += tst_qmediacontent.cpp
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qmediaobject/qmediaobject.pro b/tests/auto/unit/qmediaobject/qmediaobject.pro
index 597ddd009..71a22ee62 100644
--- a/tests/auto/unit/qmediaobject/qmediaobject.pro
+++ b/tests/auto/unit/qmediaobject/qmediaobject.pro
@@ -6,4 +6,3 @@ include (../qmultimedia_common/mockrecorder.pri)
include (../qmultimedia_common/mock.pri)
SOURCES += tst_qmediaobject.cpp
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qmediaplayer/qmediaplayer.pro b/tests/auto/unit/qmediaplayer/qmediaplayer.pro
index cbdbf71f4..da52f081d 100644
--- a/tests/auto/unit/qmediaplayer/qmediaplayer.pro
+++ b/tests/auto/unit/qmediaplayer/qmediaplayer.pro
@@ -6,4 +6,3 @@ RESOURCES += testdata.qrc
include (../qmultimedia_common/mock.pri)
include (../qmultimedia_common/mockplayer.pri)
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qmediaplayerwidgets/qmediaplayerwidgets.pro b/tests/auto/unit/qmediaplayerwidgets/qmediaplayerwidgets.pro
index ce723fbe1..97232f934 100644
--- a/tests/auto/unit/qmediaplayerwidgets/qmediaplayerwidgets.pro
+++ b/tests/auto/unit/qmediaplayerwidgets/qmediaplayerwidgets.pro
@@ -5,4 +5,3 @@ SOURCES += tst_qmediaplayerwidgets.cpp
include (../qmultimedia_common/mock.pri)
include (../qmultimedia_common/mockplayer.pri)
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro b/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro
index 97dba9339..4c1aceceb 100644
--- a/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro
+++ b/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro
@@ -15,4 +15,3 @@ SOURCES += \
INCLUDEPATH += ../../../../src/plugins/m3u
TESTDATA += testdata/*
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qmediaplaylistnavigator/qmediaplaylistnavigator.pro b/tests/auto/unit/qmediaplaylistnavigator/qmediaplaylistnavigator.pro
index 84bbddbcb..042e6ac4c 100644
--- a/tests/auto/unit/qmediaplaylistnavigator/qmediaplaylistnavigator.pro
+++ b/tests/auto/unit/qmediaplaylistnavigator/qmediaplaylistnavigator.pro
@@ -5,4 +5,3 @@ QT += multimedia-private testlib
SOURCES += tst_qmediaplaylistnavigator.cpp
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qmediapluginloader/qmediapluginloader.pro b/tests/auto/unit/qmediapluginloader/qmediapluginloader.pro
index 36351ce7b..26f232010 100644
--- a/tests/auto/unit/qmediapluginloader/qmediapluginloader.pro
+++ b/tests/auto/unit/qmediapluginloader/qmediapluginloader.pro
@@ -11,4 +11,3 @@ wince* {
DEPLOYMENT += PLUGIN_DEPLOY
}
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qmediarecorder/qmediarecorder.pro b/tests/auto/unit/qmediarecorder/qmediarecorder.pro
index f6fac0440..417ba17d2 100644
--- a/tests/auto/unit/qmediarecorder/qmediarecorder.pro
+++ b/tests/auto/unit/qmediarecorder/qmediarecorder.pro
@@ -5,4 +5,3 @@ SOURCES += tst_qmediarecorder.cpp
include (../qmultimedia_common/mock.pri)
include (../qmultimedia_common/mockrecorder.pri)
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qmediaresource/qmediaresource.pro b/tests/auto/unit/qmediaresource/qmediaresource.pro
index dcc0bffcc..e728fb4f5 100644
--- a/tests/auto/unit/qmediaresource/qmediaresource.pro
+++ b/tests/auto/unit/qmediaresource/qmediaresource.pro
@@ -5,4 +5,3 @@ QT += network multimedia-private testlib
SOURCES += tst_qmediaresource.cpp
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qmediaservice/qmediaservice.pro b/tests/auto/unit/qmediaservice/qmediaservice.pro
index bdf49b74c..b95554807 100644
--- a/tests/auto/unit/qmediaservice/qmediaservice.pro
+++ b/tests/auto/unit/qmediaservice/qmediaservice.pro
@@ -4,4 +4,3 @@ TARGET = tst_qmediaservice
QT += multimedia-private testlib
SOURCES += tst_qmediaservice.cpp
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro
index 68dee28a9..c17f5c3d6 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro
@@ -20,4 +20,3 @@ OTHER_FILES += mockserviceplugin1.json
target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE}
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro
index 98a3ca4a4..21c78790e 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro
@@ -20,4 +20,3 @@ OTHER_FILES += mockserviceplugin2.json
target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE}
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro
index 50def293f..4e516a095 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro
@@ -20,4 +20,3 @@ OTHER_FILES += mockserviceplugin3.json
target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE}
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro
index 57b715f52..3446e2456 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro
@@ -20,4 +20,3 @@ OTHER_FILES += mockserviceplugin4.json
target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE}
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro
index 9657e3cc1..2358fa503 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro
@@ -20,4 +20,3 @@ OTHER_FILES += mockserviceplugin5.json
target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE}
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qmediaserviceprovider/test/test.pro b/tests/auto/unit/qmediaserviceprovider/test/test.pro
index 38b6febf8..2cf78c100 100644
--- a/tests/auto/unit/qmediaserviceprovider/test/test.pro
+++ b/tests/auto/unit/qmediaserviceprovider/test/test.pro
@@ -15,4 +15,3 @@ win32 {
mac: CONFIG -= app_bundle
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qmediatimerange/qmediatimerange.pro b/tests/auto/unit/qmediatimerange/qmediatimerange.pro
index 69af820cf..c59c3d8df 100644
--- a/tests/auto/unit/qmediatimerange/qmediatimerange.pro
+++ b/tests/auto/unit/qmediatimerange/qmediatimerange.pro
@@ -5,4 +5,3 @@ QT += multimedia-private testlib
SOURCES += tst_qmediatimerange.cpp
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qmetadatareadercontrol/qmetadatareadercontrol.pro b/tests/auto/unit/qmetadatareadercontrol/qmetadatareadercontrol.pro
index 44eaf7e63..1ed2b3443 100644
--- a/tests/auto/unit/qmetadatareadercontrol/qmetadatareadercontrol.pro
+++ b/tests/auto/unit/qmetadatareadercontrol/qmetadatareadercontrol.pro
@@ -7,4 +7,3 @@ SOURCES += tst_qmetadatareadercontrol.cpp
include (../qmultimedia_common/mockcontainer.pri)
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qmetadatawritercontrol/qmetadatawritercontrol.pro b/tests/auto/unit/qmetadatawritercontrol/qmetadatawritercontrol.pro
index 70ca1ebea..db7e964ba 100644
--- a/tests/auto/unit/qmetadatawritercontrol/qmetadatawritercontrol.pro
+++ b/tests/auto/unit/qmetadatawritercontrol/qmetadatawritercontrol.pro
@@ -6,4 +6,3 @@ QT += multimedia-private testlib
SOURCES += tst_qmetadatawritercontrol.cpp
include (../qmultimedia_common/mockcontainer.pri)
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro b/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro
index 30ce70b79..5f7fe30b9 100644
--- a/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro
+++ b/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro
@@ -11,7 +11,6 @@ qtHaveModule(opengl) {
SOURCES += tst_qpaintervideosurface.cpp
QT+=widgets
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
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/qpaintervideosurface/tst_qpaintervideosurface.cpp
index a68103912..7dcb103e5 100644
--- a/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp
+++ b/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp
@@ -563,7 +563,7 @@ void tst_QPainterVideoSurface::shaderType()
QPainterVideoSurface surface;
QGLWidget widget;
widget.show();
- QTest::qWaitForWindowShown(&widget);
+ QTest::qWaitForWindowExposed(&widget);
widget.makeCurrent();
QCOMPARE(surface.shaderType(), QPainterVideoSurface::NoShaders);
@@ -655,7 +655,7 @@ void tst_QPainterVideoSurface::shaderTypeStarted()
QGLWidget widget;
widget.show();
- QTest::qWaitForWindowShown(&widget);
+ QTest::qWaitForWindowExposed(&widget);
widget.makeCurrent();
QPainterVideoSurface surface;
@@ -900,7 +900,7 @@ void tst_QPainterVideoSurface::shaderSupportedFormat()
QGLWidget widget;
widget.show();
- QTest::qWaitForWindowShown(&widget);
+ QTest::qWaitForWindowExposed(&widget);
widget.makeCurrent();
QPainterVideoSurface surface;
@@ -1017,7 +1017,7 @@ void tst_QPainterVideoSurface::shaderPresent()
QGLWidget widget;
widget.show();
- QTest::qWaitForWindowShown(&widget);
+ QTest::qWaitForWindowExposed(&widget);
widget.makeCurrent();
QPainterVideoSurface surface;
@@ -1148,7 +1148,7 @@ void tst_QPainterVideoSurface::shaderPresentOpaqueFrame()
QGLWidget widget;
widget.show();
- QTest::qWaitForWindowShown(&widget);
+ QTest::qWaitForWindowExposed(&widget);
widget.makeCurrent();
QPainterVideoSurface surface;
@@ -1197,7 +1197,7 @@ void tst_QPainterVideoSurface::shaderPresentGLFrame()
QGLWidget widget;
widget.show();
- QTest::qWaitForWindowShown(&widget);
+ QTest::qWaitForWindowExposed(&widget);
widget.makeCurrent();
QPainterVideoSurface surface;
diff --git a/tests/auto/unit/qradiodata/qradiodata.pro b/tests/auto/unit/qradiodata/qradiodata.pro
index a4937cc51..b8914c222 100644
--- a/tests/auto/unit/qradiodata/qradiodata.pro
+++ b/tests/auto/unit/qradiodata/qradiodata.pro
@@ -5,4 +5,3 @@ SOURCES += tst_qradiodata.cpp
include (../qmultimedia_common/mock.pri)
include (../qmultimedia_common/mockradio.pri)
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qradiotuner/qradiotuner.pro b/tests/auto/unit/qradiotuner/qradiotuner.pro
index e0638c1f8..4298110d7 100644
--- a/tests/auto/unit/qradiotuner/qradiotuner.pro
+++ b/tests/auto/unit/qradiotuner/qradiotuner.pro
@@ -5,4 +5,3 @@ SOURCES += tst_qradiotuner.cpp
include (../qmultimedia_common/mock.pri)
include (../qmultimedia_common/mockradio.pri)
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qsamplecache/qsamplecache.pro b/tests/auto/unit/qsamplecache/qsamplecache.pro
index 1f0db1b58..c17c15919 100644
--- a/tests/auto/unit/qsamplecache/qsamplecache.pro
+++ b/tests/auto/unit/qsamplecache/qsamplecache.pro
@@ -6,4 +6,3 @@ QT += multimedia-private testlib
SOURCES += tst_qsamplecache.cpp
TESTDATA += testdata/*
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qvideoencodersettingscontrol/qvideoencodersettingscontrol.pro b/tests/auto/unit/qvideoencodersettingscontrol/qvideoencodersettingscontrol.pro
index 58800eed9..7b7ef7679 100644
--- a/tests/auto/unit/qvideoencodersettingscontrol/qvideoencodersettingscontrol.pro
+++ b/tests/auto/unit/qvideoencodersettingscontrol/qvideoencodersettingscontrol.pro
@@ -6,4 +6,3 @@ QT += multimedia-private testlib
SOURCES += \
tst_qvideoencodersettingscontrol.cpp
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qvideoframe/qvideoframe.pro b/tests/auto/unit/qvideoframe/qvideoframe.pro
index 1e2baa514..2d7bc0360 100644
--- a/tests/auto/unit/qvideoframe/qvideoframe.pro
+++ b/tests/auto/unit/qvideoframe/qvideoframe.pro
@@ -5,4 +5,3 @@ QT += core multimedia-private testlib
SOURCES += tst_qvideoframe.cpp
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qvideoprobe/qvideoprobe.pro b/tests/auto/unit/qvideoprobe/qvideoprobe.pro
index 0bd4102a8..03c7d56f7 100644
--- a/tests/auto/unit/qvideoprobe/qvideoprobe.pro
+++ b/tests/auto/unit/qvideoprobe/qvideoprobe.pro
@@ -8,4 +8,3 @@ SOURCES += tst_qvideoprobe.cpp
include (../qmultimedia_common/mock.pri)
include (../qmultimedia_common/mockrecorder.pri)
include (../qmultimedia_common/mockplayer.pri)
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qvideosurfaceformat/qvideosurfaceformat.pro b/tests/auto/unit/qvideosurfaceformat/qvideosurfaceformat.pro
index a5c627aa8..28cd0ad55 100644
--- a/tests/auto/unit/qvideosurfaceformat/qvideosurfaceformat.pro
+++ b/tests/auto/unit/qvideosurfaceformat/qvideosurfaceformat.pro
@@ -5,4 +5,3 @@ QT += core multimedia-private testlib
SOURCES += tst_qvideosurfaceformat.cpp
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qvideowidget/qvideowidget.pro b/tests/auto/unit/qvideowidget/qvideowidget.pro
index efeb91d39..e12e3a050 100644
--- a/tests/auto/unit/qvideowidget/qvideowidget.pro
+++ b/tests/auto/unit/qvideowidget/qvideowidget.pro
@@ -6,4 +6,3 @@ QT += multimedia-private multimediawidgets-private testlib
SOURCES += tst_qvideowidget.cpp
QT+=widgets
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qwavedecoder/qwavedecoder.pro b/tests/auto/unit/qwavedecoder/qwavedecoder.pro
index 1b6af7e86..39ebaf63e 100644
--- a/tests/auto/unit/qwavedecoder/qwavedecoder.pro
+++ b/tests/auto/unit/qwavedecoder/qwavedecoder.pro
@@ -7,4 +7,3 @@ QT += multimedia-private testlib network
CONFIG += no_private_qt_headers_warning testcase
TESTDATA += data/*
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0