From: Thiago Macieira Date: Wed, 1 Aug 2012 14:35:23 +0000 (+0200) Subject: Set the Qt API level to compatibility mode in all tests. X-Git-Tag: upstream/5.2.95+rc1~224 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8e49af7ef56f9b58e5a51c80b40fe674ec432b87;p=platform%2Fupstream%2Fqtmultimedia.git Set the Qt API level to compatibility mode in all tests. Qt 5.0 beta requires changing the default to the 5.0 API, disabling the deprecated code. However, tests should test (and often do) the compatibility API too, so turn it back on. Task-number: QTBUG-25053 Change-Id: I9589f57998af237f2e89c7799789dae5a13ef634 Reviewed-by: Lars Knoll --- diff --git a/src/imports/multimedia/multimedia.pro b/src/imports/multimedia/multimedia.pro index 3cb4000..f05f312 100644 --- a/src/imports/multimedia/multimedia.pro +++ b/src/imports/multimedia/multimedia.pro @@ -48,4 +48,6 @@ SOURCES += \ QML_FILES += \ Video.qml +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 + load(qml_plugin) diff --git a/tests/auto/integration/qaudiodecoderbackend/qaudiodecoderbackend.pro b/tests/auto/integration/qaudiodecoderbackend/qaudiodecoderbackend.pro index 8c88578..f15ee44 100644 --- a/tests/auto/integration/qaudiodecoderbackend/qaudiodecoderbackend.pro +++ b/tests/auto/integration/qaudiodecoderbackend/qaudiodecoderbackend.pro @@ -12,3 +12,4 @@ 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 7138206..387a141 100644 --- a/tests/auto/integration/qaudiodeviceinfo/qaudiodeviceinfo.pro +++ b/tests/auto/integration/qaudiodeviceinfo/qaudiodeviceinfo.pro @@ -8,3 +8,4 @@ CONFIG += testcase insignificant_test 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 d8568a9..bd8ea78 100644 --- a/tests/auto/integration/qaudioinput/qaudioinput.pro +++ b/tests/auto/integration/qaudioinput/qaudioinput.pro @@ -8,3 +8,4 @@ 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 150a6a1..62f5063 100644 --- a/tests/auto/integration/qaudiooutput/qaudiooutput.pro +++ b/tests/auto/integration/qaudiooutput/qaudiooutput.pro @@ -10,3 +10,4 @@ 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 3457b31..2d3550c 100644 --- a/tests/auto/integration/qcamerabackend/qcamerabackend.pro +++ b/tests/auto/integration/qcamerabackend/qcamerabackend.pro @@ -7,3 +7,4 @@ CONFIG += no_private_qt_headers_warning 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 8264e36..16a8528 100644 --- a/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro +++ b/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro @@ -11,3 +11,4 @@ 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 0cec320..222ed51 100644 --- a/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro +++ b/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro @@ -11,3 +11,4 @@ SOURCES += \ tst_qdeclarativevideooutput_window.cpp INCLUDEPATH += ../../../../src/imports/multimedia +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro b/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro index 7f1a44e..7dc62b6 100644 --- a/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro +++ b/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro @@ -11,3 +11,4 @@ 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 b288b05..63dd095 100644 --- a/tests/auto/integration/qml/qml.pro +++ b/tests/auto/integration/qml/qml.pro @@ -8,3 +8,4 @@ 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 0b431c2..0a0ed09 100644 --- a/tests/auto/integration/qsound/qsound.pro +++ b/tests/auto/integration/qsound/qsound.pro @@ -11,3 +11,4 @@ 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 4ef2103..e3200ce 100644 --- a/tests/auto/integration/qsoundeffect/qsoundeffect.pro +++ b/tests/auto/integration/qsoundeffect/qsoundeffect.pro @@ -17,3 +17,4 @@ unix:!mac { TESTDATA += test.wav win32: CONFIG += insignificant_test +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/unit/qabstractvideobuffer/qabstractvideobuffer.pro b/tests/auto/unit/qabstractvideobuffer/qabstractvideobuffer.pro index dfb7e5d..22cf714 100644 --- a/tests/auto/unit/qabstractvideobuffer/qabstractvideobuffer.pro +++ b/tests/auto/unit/qabstractvideobuffer/qabstractvideobuffer.pro @@ -6,3 +6,4 @@ CONFIG += no_private_qt_headers_warning 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 c1718a6..4d8f9f1 100644 --- a/tests/auto/unit/qabstractvideosurface/qabstractvideosurface.pro +++ b/tests/auto/unit/qabstractvideosurface/qabstractvideosurface.pro @@ -6,3 +6,4 @@ CONFIG += no_private_qt_headers_warning 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 18b8c68..0694bf8 100644 --- a/tests/auto/unit/qaudiobuffer/qaudiobuffer.pro +++ b/tests/auto/unit/qaudiobuffer/qaudiobuffer.pro @@ -14,3 +14,4 @@ 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 2120484..ff9ba8f 100644 --- a/tests/auto/unit/qaudiodecoder/qaudiodecoder.pro +++ b/tests/auto/unit/qaudiodecoder/qaudiodecoder.pro @@ -19,3 +19,4 @@ 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 59ba5c3..b9edca0 100644 --- a/tests/auto/unit/qaudioformat/qaudioformat.pro +++ b/tests/auto/unit/qaudioformat/qaudioformat.pro @@ -6,3 +6,4 @@ CONFIG += no_private_qt_headers_warning 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 30052ce..40b8107 100644 --- a/tests/auto/unit/qaudionamespace/qaudionamespace.pro +++ b/tests/auto/unit/qaudionamespace/qaudionamespace.pro @@ -6,3 +6,4 @@ CONFIG += no_private_qt_headers_warning 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 3d275b4..fe20007 100644 --- a/tests/auto/unit/qaudioprobe/qaudioprobe.pro +++ b/tests/auto/unit/qaudioprobe/qaudioprobe.pro @@ -8,3 +8,4 @@ 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 ccb5531..7ee5222 100644 --- a/tests/auto/unit/qaudiorecorder/qaudiorecorder.pro +++ b/tests/auto/unit/qaudiorecorder/qaudiorecorder.pro @@ -8,3 +8,4 @@ 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 095349d..1e10098 100644 --- a/tests/auto/unit/qcamera/qcamera.pro +++ b/tests/auto/unit/qcamera/qcamera.pro @@ -8,3 +8,4 @@ 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 fdd2cf5..1a8e66a 100644 --- a/tests/auto/unit/qcameraimagecapture/qcameraimagecapture.pro +++ b/tests/auto/unit/qcameraimagecapture/qcameraimagecapture.pro @@ -9,3 +9,4 @@ SOURCES += \ include (../qmultimedia_common/mock.pri) include (../qmultimedia_common/mockcamera.pri) +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/unit/qcameraviewfinder/qcameraviewfinder.pro b/tests/auto/unit/qcameraviewfinder/qcameraviewfinder.pro index a53729a..3c2b4bb 100644 --- a/tests/auto/unit/qcameraviewfinder/qcameraviewfinder.pro +++ b/tests/auto/unit/qcameraviewfinder/qcameraviewfinder.pro @@ -9,3 +9,4 @@ 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 f7a6f5e..adaed0b 100644 --- a/tests/auto/unit/qcamerawidgets/qcamerawidgets.pro +++ b/tests/auto/unit/qcamerawidgets/qcamerawidgets.pro @@ -10,3 +10,4 @@ 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 0584cba..756ba3f 100644 --- a/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro +++ b/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro @@ -13,3 +13,4 @@ SOURCES += \ $$QT.multimedia.sources/../imports/multimedia/qdeclarativeaudio.cpp INCLUDEPATH += $$QT.multimedia.sources/../imports/multimedia +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro b/tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro index 2dfa64c..c9435ea 100644 --- a/tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro +++ b/tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro @@ -16,3 +16,4 @@ SOURCES += \ INCLUDEPATH += $$QT.multimedia.sources/../imports/multimedia QT+=widgets +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/unit/qgraphicsvideoitem/qgraphicsvideoitem.pro b/tests/auto/unit/qgraphicsvideoitem/qgraphicsvideoitem.pro index a97b3c2..81fa546 100644 --- a/tests/auto/unit/qgraphicsvideoitem/qgraphicsvideoitem.pro +++ b/tests/auto/unit/qgraphicsvideoitem/qgraphicsvideoitem.pro @@ -7,3 +7,4 @@ CONFIG += no_private_qt_headers_warning 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 366a4e6..882bd2e 100644 --- a/tests/auto/unit/qmediabindableinterface/qmediabindableinterface.pro +++ b/tests/auto/unit/qmediabindableinterface/qmediabindableinterface.pro @@ -9,3 +9,4 @@ 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 90dcbf8..300d8f5 100644 --- a/tests/auto/unit/qmediacontainercontrol/qmediacontainercontrol.pro +++ b/tests/auto/unit/qmediacontainercontrol/qmediacontainercontrol.pro @@ -8,3 +8,4 @@ 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 d55218d..c42093a 100644 --- a/tests/auto/unit/qmediacontent/qmediacontent.pro +++ b/tests/auto/unit/qmediacontent/qmediacontent.pro @@ -5,3 +5,4 @@ QT += multimedia-private network testlib CONFIG += no_private_qt_headers_warning 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 71a22ee..597ddd0 100644 --- a/tests/auto/unit/qmediaobject/qmediaobject.pro +++ b/tests/auto/unit/qmediaobject/qmediaobject.pro @@ -6,3 +6,4 @@ 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 126bbbe..52568c0 100644 --- a/tests/auto/unit/qmediaplayer/qmediaplayer.pro +++ b/tests/auto/unit/qmediaplayer/qmediaplayer.pro @@ -5,3 +5,4 @@ SOURCES += tst_qmediaplayer.cpp 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 97232f9..ce723fb 100644 --- a/tests/auto/unit/qmediaplayerwidgets/qmediaplayerwidgets.pro +++ b/tests/auto/unit/qmediaplayerwidgets/qmediaplayerwidgets.pro @@ -5,3 +5,4 @@ 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 a6728b5..16618ea 100644 --- a/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro +++ b/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro @@ -16,3 +16,4 @@ SOURCES += \ INCLUDEPATH += $$QT.multimedia.sources/../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 305d63b..07cc327 100644 --- a/tests/auto/unit/qmediaplaylistnavigator/qmediaplaylistnavigator.pro +++ b/tests/auto/unit/qmediaplaylistnavigator/qmediaplaylistnavigator.pro @@ -6,3 +6,4 @@ CONFIG += no_private_qt_headers_warning 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 f5947c6..6c8bd81 100644 --- a/tests/auto/unit/qmediapluginloader/qmediapluginloader.pro +++ b/tests/auto/unit/qmediapluginloader/qmediapluginloader.pro @@ -12,3 +12,4 @@ 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 417ba17..f6fac04 100644 --- a/tests/auto/unit/qmediarecorder/qmediarecorder.pro +++ b/tests/auto/unit/qmediarecorder/qmediarecorder.pro @@ -5,3 +5,4 @@ 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 b6c1e71..ea75d9d 100644 --- a/tests/auto/unit/qmediaresource/qmediaresource.pro +++ b/tests/auto/unit/qmediaresource/qmediaresource.pro @@ -6,3 +6,4 @@ CONFIG += no_private_qt_headers_warning 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 9ae2c54..fe6481d 100644 --- a/tests/auto/unit/qmediaservice/qmediaservice.pro +++ b/tests/auto/unit/qmediaservice/qmediaservice.pro @@ -5,3 +5,4 @@ QT += multimedia-private testlib CONFIG += no_private_qt_headers_warning 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 d8bee75..838c0d7 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro @@ -23,3 +23,4 @@ OTHER_FILES += mockserviceplugin1.json target.path += $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE} INSTALLS += target +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 8e39b5b..4f4da32 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro @@ -23,3 +23,4 @@ OTHER_FILES += mockserviceplugin2.json target.path += $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE} INSTALLS += target +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 fe26a08..52d589b 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro @@ -23,3 +23,4 @@ OTHER_FILES += mockserviceplugin3.json target.path += $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE} INSTALLS += target +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 37260d4..11b7a62 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro @@ -23,3 +23,4 @@ OTHER_FILES += mockserviceplugin4.json target.path += $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE} INSTALLS += target +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 820fba7..c1d584a 100644 --- a/tests/auto/unit/qmediaserviceprovider/test/test.pro +++ b/tests/auto/unit/qmediaserviceprovider/test/test.pro @@ -16,3 +16,4 @@ 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 0b66260..84bb2f5 100644 --- a/tests/auto/unit/qmediatimerange/qmediatimerange.pro +++ b/tests/auto/unit/qmediatimerange/qmediatimerange.pro @@ -6,3 +6,4 @@ CONFIG += no_private_qt_headers_warning 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 0793a80..e7ff03f 100644 --- a/tests/auto/unit/qmetadatareadercontrol/qmetadatareadercontrol.pro +++ b/tests/auto/unit/qmetadatareadercontrol/qmetadatareadercontrol.pro @@ -8,3 +8,4 @@ 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 eef5d32..9101171 100644 --- a/tests/auto/unit/qmetadatawritercontrol/qmetadatawritercontrol.pro +++ b/tests/auto/unit/qmetadatawritercontrol/qmetadatawritercontrol.pro @@ -7,3 +7,4 @@ CONFIG += no_private_qt_headers_warning 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 14b2098..2bbc10b 100644 --- a/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro +++ b/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro @@ -14,3 +14,4 @@ contains(QT_CONFIG, opengl): QT += opengl SOURCES += tst_qpaintervideosurface.cpp QT+=widgets +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/unit/qradiodata/qradiodata.pro b/tests/auto/unit/qradiodata/qradiodata.pro index b8914c2..a4937cc 100644 --- a/tests/auto/unit/qradiodata/qradiodata.pro +++ b/tests/auto/unit/qradiodata/qradiodata.pro @@ -5,3 +5,4 @@ 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 4298110..e0638c1 100644 --- a/tests/auto/unit/qradiotuner/qradiotuner.pro +++ b/tests/auto/unit/qradiotuner/qradiotuner.pro @@ -5,3 +5,4 @@ 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 c17c159..1f0db1b 100644 --- a/tests/auto/unit/qsamplecache/qsamplecache.pro +++ b/tests/auto/unit/qsamplecache/qsamplecache.pro @@ -6,3 +6,4 @@ 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 8919852..f6c568d 100644 --- a/tests/auto/unit/qvideoencodersettingscontrol/qvideoencodersettingscontrol.pro +++ b/tests/auto/unit/qvideoencodersettingscontrol/qvideoencodersettingscontrol.pro @@ -7,3 +7,4 @@ CONFIG += no_private_qt_headers_warning 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 cfd84a2..7df5b05 100644 --- a/tests/auto/unit/qvideoframe/qvideoframe.pro +++ b/tests/auto/unit/qvideoframe/qvideoframe.pro @@ -6,3 +6,4 @@ CONFIG += no_private_qt_headers_warning 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 03c7d56..0bd4102 100644 --- a/tests/auto/unit/qvideoprobe/qvideoprobe.pro +++ b/tests/auto/unit/qvideoprobe/qvideoprobe.pro @@ -8,3 +8,4 @@ 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 a0e6266..e923e60 100644 --- a/tests/auto/unit/qvideosurfaceformat/qvideosurfaceformat.pro +++ b/tests/auto/unit/qvideosurfaceformat/qvideosurfaceformat.pro @@ -6,3 +6,4 @@ CONFIG += no_private_qt_headers_warning 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 e7b2095..e9c1b25 100644 --- a/tests/auto/unit/qvideowidget/qvideowidget.pro +++ b/tests/auto/unit/qvideowidget/qvideowidget.pro @@ -7,3 +7,4 @@ CONFIG += no_private_qt_headers_warning 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 ce9762b..18e74db 100644 --- a/tests/auto/unit/qwavedecoder/qwavedecoder.pro +++ b/tests/auto/unit/qwavedecoder/qwavedecoder.pro @@ -7,3 +7,4 @@ QT += multimedia-private testlib network CONFIG += no_private_qt_headers_warning testcase TESTDATA += data/* +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0