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 <lars.knoll@nokia.com>
2012-08-01 16:35:23 +02:00
parent 218fff76d5
commit 8e49af7ef5
57 changed files with 58 additions and 0 deletions
@@ -12,3 +12,4 @@ INCLUDEPATH += \

 SOURCES += \
    tst_qaudiodecoderbackend.cpp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -8,3 +8,4 @@ CONFIG += testcase insignificant_test

 SOURCES += tst_qaudiodeviceinfo.cpp

+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -8,3 +8,4 @@ CONFIG += testcase insignificant_test

 HEADERS += wavheader.h
 SOURCES += wavheader.cpp tst_qaudioinput.cpp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -10,3 +10,4 @@ HEADERS += wavheader.h
 SOURCES += wavheader.cpp tst_qaudiooutput.cpp

 mac: CONFIG += insignificant_test
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -7,3 +7,4 @@ CONFIG += no_private_qt_headers_warning
 CONFIG += testcase

 SOURCES += tst_qcamerabackend.cpp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -11,3 +11,4 @@ SOURCES += \
        tst_qdeclarativevideooutput.cpp

 INCLUDEPATH += ../../../../src/imports/multimedia
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -11,3 +11,4 @@ SOURCES += \
        tst_qdeclarativevideooutput_window.cpp

 INCLUDEPATH += ../../../../src/imports/multimedia
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -11,3 +11,4 @@ SOURCES += \
    tst_qmediaplayerbackend.cpp

 TESTDATA += testdata/*
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -8,3 +8,4 @@ importFiles.files = soundeffect

 importFiles.path = .
 DEPLOYMENT += importFiles
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -11,3 +11,4 @@ SOURCES += tst_qsound.cpp
 TESTDATA += test.wav

 win32: CONFIG += insignificant_test
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -17,3 +17,4 @@ unix:!mac {
 TESTDATA += test.wav

 win32: CONFIG += insignificant_test
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -6,3 +6,4 @@ CONFIG += no_private_qt_headers_warning

 SOURCES += tst_qabstractvideobuffer.cpp

+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -6,3 +6,4 @@ CONFIG += no_private_qt_headers_warning

 SOURCES += tst_qabstractvideosurface.cpp

+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -14,3 +14,4 @@ CONFIG   -= app_bundle
 TEMPLATE = app

 SOURCES += tst_qaudiobuffer.cpp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -19,3 +19,4 @@ include (../qmultimedia_common/mock.pri)
 include (../qmultimedia_common/mockdecoder.pri)

 SOURCES += tst_qaudiodecoder.cpp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -6,3 +6,4 @@ CONFIG += no_private_qt_headers_warning

 SOURCES += tst_qaudioformat.cpp

+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -6,3 +6,4 @@ CONFIG += no_private_qt_headers_warning

 SOURCES += tst_qaudionamespace.cpp

+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -8,3 +8,4 @@ SOURCES += tst_qaudioprobe.cpp
 include (../qmultimedia_common/mock.pri)
 include (../qmultimedia_common/mockrecorder.pri)

+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -8,3 +8,4 @@ SOURCES += tst_qaudiorecorder.cpp
 include (../qmultimedia_common/mock.pri)
 include (../qmultimedia_common/mockrecorder.pri)

+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -8,3 +8,4 @@ include (../qmultimedia_common/mock.pri)
 include (../qmultimedia_common/mockcamera.pri)

 SOURCES += tst_qcamera.cpp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -9,3 +9,4 @@ SOURCES += \

 include (../qmultimedia_common/mock.pri)
 include (../qmultimedia_common/mockcamera.pri)
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -9,3 +9,4 @@ include (../qmultimedia_common/mockcamera.pri)

 SOURCES += tst_qcameraviewfinder.cpp
 QT+=widgets
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -10,3 +10,4 @@ include (../qmultimedia_common/mockcamera.pri)
 SOURCES += tst_qcamerawidgets.cpp

 QT+=widgets
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -13,3 +13,4 @@ SOURCES += \
        $$QT.multimedia.sources/../imports/multimedia/qdeclarativeaudio.cpp

 INCLUDEPATH += $$QT.multimedia.sources/../imports/multimedia
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -16,3 +16,4 @@ SOURCES += \

 INCLUDEPATH += $$QT.multimedia.sources/../imports/multimedia
 QT+=widgets
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -7,3 +7,4 @@ CONFIG += no_private_qt_headers_warning
 SOURCES += tst_qgraphicsvideoitem.cpp

 QT+=widgets
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -9,3 +9,4 @@ SOURCES += \

 include (../qmultimedia_common/mock.pri)
 include (../qmultimedia_common/mockrecorder.pri)
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -8,3 +8,4 @@ SOURCES += tst_qmediacontainercontrol.cpp

 include (../qmultimedia_common/mockcontainer.pri)

+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -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
@@ -6,3 +6,4 @@ include (../qmultimedia_common/mockrecorder.pri)
 include (../qmultimedia_common/mock.pri)

 SOURCES += tst_qmediaobject.cpp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -5,3 +5,4 @@ SOURCES += tst_qmediaplayer.cpp

 include (../qmultimedia_common/mock.pri)
 include (../qmultimedia_common/mockplayer.pri)
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -5,3 +5,4 @@ SOURCES += tst_qmediaplayerwidgets.cpp

 include (../qmultimedia_common/mock.pri)
 include (../qmultimedia_common/mockplayer.pri)
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -16,3 +16,4 @@ SOURCES += \
 INCLUDEPATH += $$QT.multimedia.sources/../plugins/m3u

 TESTDATA += testdata/*
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -6,3 +6,4 @@ CONFIG += no_private_qt_headers_warning

 SOURCES += tst_qmediaplaylistnavigator.cpp

+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -12,3 +12,4 @@ wince* {
    DEPLOYMENT += PLUGIN_DEPLOY
 }

+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -5,3 +5,4 @@ SOURCES += tst_qmediarecorder.cpp

 include (../qmultimedia_common/mock.pri)
 include (../qmultimedia_common/mockrecorder.pri)
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -6,3 +6,4 @@ CONFIG += no_private_qt_headers_warning

 SOURCES += tst_qmediaresource.cpp

+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -5,3 +5,4 @@ QT += multimedia-private testlib
 CONFIG += no_private_qt_headers_warning

 SOURCES += tst_qmediaservice.cpp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -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
@@ -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
@@ -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
@@ -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
@@ -16,3 +16,4 @@ win32 {

 mac: CONFIG -= app_bundle

+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -6,3 +6,4 @@ CONFIG += no_private_qt_headers_warning

 SOURCES += tst_qmediatimerange.cpp

+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -8,3 +8,4 @@ SOURCES += tst_qmetadatareadercontrol.cpp

 include (../qmultimedia_common/mockcontainer.pri)

+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -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
@@ -14,3 +14,4 @@ contains(QT_CONFIG, opengl): QT += opengl
 SOURCES += tst_qpaintervideosurface.cpp

 QT+=widgets
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -5,3 +5,4 @@ SOURCES += tst_qradiodata.cpp

 include (../qmultimedia_common/mock.pri)
 include (../qmultimedia_common/mockradio.pri)
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -5,3 +5,4 @@ SOURCES += tst_qradiotuner.cpp

 include (../qmultimedia_common/mock.pri)
 include (../qmultimedia_common/mockradio.pri)
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -6,3 +6,4 @@ QT += multimedia-private testlib
 SOURCES += tst_qsamplecache.cpp

 TESTDATA += testdata/*
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -7,3 +7,4 @@ CONFIG += no_private_qt_headers_warning
 SOURCES += \
    tst_qvideoencodersettingscontrol.cpp

+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -6,3 +6,4 @@ CONFIG += no_private_qt_headers_warning

 SOURCES += tst_qvideoframe.cpp

+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -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
@@ -6,3 +6,4 @@ CONFIG += no_private_qt_headers_warning

 SOURCES += tst_qvideosurfaceformat.cpp

+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -7,3 +7,4 @@ CONFIG += no_private_qt_headers_warning
 SOURCES += tst_qvideowidget.cpp

 QT+=widgets
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
@@ -7,3 +7,4 @@ QT += multimedia-private testlib network
 CONFIG += no_private_qt_headers_warning testcase

 TESTDATA += data/*
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0