slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Set the Qt API level to compatibility mode in all tests.

Browse Source 
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>
This commit is contained in:
Thiago Macieira
2012-08-01 16:35:23 +02:00
committed by Qt by Nokia
parent 218fff76d5
commit 8e49af7ef5
57 changed files with 58 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/imports/multimedia/multimedia.pro
+2
View File
@@ -48,4 +48,6 @@ SOURCES += \
QML_FILES += \ QML_FILES += \
Video.qml Video.qml
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
load(qml_plugin) load(qml_plugin)
tests/auto/integration/qaudiodecoderbackend/qaudiodecoderbackend.pro
+1
View File
@@ -12,3 +12,4 @@ INCLUDEPATH += \
SOURCES += \ SOURCES += \
tst_qaudiodecoderbackend.cpp tst_qaudiodecoderbackend.cpp
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/integration/qaudiodeviceinfo/qaudiodeviceinfo.pro
+1
View File
@@ -8,3 +8,4 @@ CONFIG += testcase insignificant_test
SOURCES += tst_qaudiodeviceinfo.cpp SOURCES += tst_qaudiodeviceinfo.cpp
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/integration/qaudioinput/qaudioinput.pro
+1
View File
@@ -8,3 +8,4 @@ CONFIG += testcase insignificant_test
HEADERS += wavheader.h HEADERS += wavheader.h
SOURCES += wavheader.cpp tst_qaudioinput.cpp SOURCES += wavheader.cpp tst_qaudioinput.cpp
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/integration/qaudiooutput/qaudiooutput.pro
+1
View File
@@ -10,3 +10,4 @@ HEADERS += wavheader.h
SOURCES += wavheader.cpp tst_qaudiooutput.cpp SOURCES += wavheader.cpp tst_qaudiooutput.cpp
mac: CONFIG += insignificant_test mac: CONFIG += insignificant_test
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/integration/qcamerabackend/qcamerabackend.pro
+1
View File
@@ -7,3 +7,4 @@ CONFIG += no_private_qt_headers_warning
CONFIG += testcase CONFIG += testcase
SOURCES += tst_qcamerabackend.cpp SOURCES += tst_qcamerabackend.cpp
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro
+1
View File
@@ -11,3 +11,4 @@ SOURCES += \
tst_qdeclarativevideooutput.cpp tst_qdeclarativevideooutput.cpp
INCLUDEPATH += ../../../../src/imports/multimedia INCLUDEPATH += ../../../../src/imports/multimedia
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro
+1
View File
@@ -11,3 +11,4 @@ SOURCES += \
tst_qdeclarativevideooutput_window.cpp tst_qdeclarativevideooutput_window.cpp
INCLUDEPATH += ../../../../src/imports/multimedia INCLUDEPATH += ../../../../src/imports/multimedia
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro
+1
View File
@@ -11,3 +11,4 @@ SOURCES += \
tst_qmediaplayerbackend.cpp tst_qmediaplayerbackend.cpp
TESTDATA += testdata/* TESTDATA += testdata/*
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/integration/qml/qml.pro
+1
View File
@@ -8,3 +8,4 @@ importFiles.files = soundeffect
importFiles.path = . importFiles.path = .
DEPLOYMENT += importFiles DEPLOYMENT += importFiles
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/integration/qsound/qsound.pro
+1
View File
@@ -11,3 +11,4 @@ SOURCES += tst_qsound.cpp
TESTDATA += test.wav TESTDATA += test.wav
win32: CONFIG += insignificant_test win32: CONFIG += insignificant_test
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/integration/qsoundeffect/qsoundeffect.pro
+1
View File
@@ -17,3 +17,4 @@ unix:!mac {
TESTDATA += test.wav TESTDATA += test.wav
win32: CONFIG += insignificant_test win32: CONFIG += insignificant_test
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qabstractvideobuffer/qabstractvideobuffer.pro
+1
View File
@@ -6,3 +6,4 @@ CONFIG += no_private_qt_headers_warning
SOURCES += tst_qabstractvideobuffer.cpp SOURCES += tst_qabstractvideobuffer.cpp
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qabstractvideosurface/qabstractvideosurface.pro
+1
View File
@@ -6,3 +6,4 @@ CONFIG += no_private_qt_headers_warning
SOURCES += tst_qabstractvideosurface.cpp SOURCES += tst_qabstractvideosurface.cpp
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qaudiobuffer/qaudiobuffer.pro
+1
View File
@@ -14,3 +14,4 @@ CONFIG -= app_bundle
TEMPLATE = app TEMPLATE = app
SOURCES += tst_qaudiobuffer.cpp SOURCES += tst_qaudiobuffer.cpp
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qaudiodecoder/qaudiodecoder.pro
+1
View File
@@ -19,3 +19,4 @@ include (../qmultimedia_common/mock.pri)
include (../qmultimedia_common/mockdecoder.pri) include (../qmultimedia_common/mockdecoder.pri)
SOURCES += tst_qaudiodecoder.cpp SOURCES += tst_qaudiodecoder.cpp
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qaudioformat/qaudioformat.pro
+1
View File
@@ -6,3 +6,4 @@ CONFIG += no_private_qt_headers_warning
SOURCES += tst_qaudioformat.cpp SOURCES += tst_qaudioformat.cpp
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qaudionamespace/qaudionamespace.pro
+1
View File
@@ -6,3 +6,4 @@ CONFIG += no_private_qt_headers_warning
SOURCES += tst_qaudionamespace.cpp SOURCES += tst_qaudionamespace.cpp
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qaudioprobe/qaudioprobe.pro
+1
View File
@@ -8,3 +8,4 @@ SOURCES += tst_qaudioprobe.cpp
include (../qmultimedia_common/mock.pri) include (../qmultimedia_common/mock.pri)
include (../qmultimedia_common/mockrecorder.pri) include (../qmultimedia_common/mockrecorder.pri)
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qaudiorecorder/qaudiorecorder.pro
+1
View File
@@ -8,3 +8,4 @@ SOURCES += tst_qaudiorecorder.cpp
include (../qmultimedia_common/mock.pri) include (../qmultimedia_common/mock.pri)
include (../qmultimedia_common/mockrecorder.pri) include (../qmultimedia_common/mockrecorder.pri)
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qcamera/qcamera.pro
+1
View File
@@ -8,3 +8,4 @@ include (../qmultimedia_common/mock.pri)
include (../qmultimedia_common/mockcamera.pri) include (../qmultimedia_common/mockcamera.pri)
SOURCES += tst_qcamera.cpp SOURCES += tst_qcamera.cpp
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qcameraimagecapture/qcameraimagecapture.pro
+1
View File
@@ -9,3 +9,4 @@ SOURCES += \
include (../qmultimedia_common/mock.pri) include (../qmultimedia_common/mock.pri)
include (../qmultimedia_common/mockcamera.pri) include (../qmultimedia_common/mockcamera.pri)
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qcameraviewfinder/qcameraviewfinder.pro
+1
View File
@@ -9,3 +9,4 @@ include (../qmultimedia_common/mockcamera.pri)
SOURCES += tst_qcameraviewfinder.cpp SOURCES += tst_qcameraviewfinder.cpp
QT+=widgets QT+=widgets
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qcamerawidgets/qcamerawidgets.pro
+1
View File
@@ -10,3 +10,4 @@ include (../qmultimedia_common/mockcamera.pri)
SOURCES += tst_qcamerawidgets.cpp SOURCES += tst_qcamerawidgets.cpp
QT+=widgets QT+=widgets
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro
+1
View File
@@ -13,3 +13,4 @@ SOURCES += \
$$QT.multimedia.sources/../imports/multimedia/qdeclarativeaudio.cpp $$QT.multimedia.sources/../imports/multimedia/qdeclarativeaudio.cpp
INCLUDEPATH += $$QT.multimedia.sources/../imports/multimedia INCLUDEPATH += $$QT.multimedia.sources/../imports/multimedia
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro
+1
View File
@@ -16,3 +16,4 @@ SOURCES += \
INCLUDEPATH += $$QT.multimedia.sources/../imports/multimedia INCLUDEPATH += $$QT.multimedia.sources/../imports/multimedia
QT+=widgets QT+=widgets
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qgraphicsvideoitem/qgraphicsvideoitem.pro
+1
View File
@@ -7,3 +7,4 @@ CONFIG += no_private_qt_headers_warning
SOURCES += tst_qgraphicsvideoitem.cpp SOURCES += tst_qgraphicsvideoitem.cpp
QT+=widgets QT+=widgets
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qmediabindableinterface/qmediabindableinterface.pro
+1
View File
@@ -9,3 +9,4 @@ SOURCES += \
include (../qmultimedia_common/mock.pri) include (../qmultimedia_common/mock.pri)
include (../qmultimedia_common/mockrecorder.pri) include (../qmultimedia_common/mockrecorder.pri)
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qmediacontainercontrol/qmediacontainercontrol.pro
+1
View File
@@ -8,3 +8,4 @@ SOURCES += tst_qmediacontainercontrol.cpp
include (../qmultimedia_common/mockcontainer.pri) include (../qmultimedia_common/mockcontainer.pri)
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qmediacontent/qmediacontent.pro
+1
View File
@@ -5,3 +5,4 @@ QT += multimedia-private network testlib
CONFIG += no_private_qt_headers_warning CONFIG += no_private_qt_headers_warning
SOURCES += tst_qmediacontent.cpp SOURCES += tst_qmediacontent.cpp
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qmediaobject/qmediaobject.pro
+1
View File
@@ -6,3 +6,4 @@ include (../qmultimedia_common/mockrecorder.pri)
include (../qmultimedia_common/mock.pri) include (../qmultimedia_common/mock.pri)
SOURCES += tst_qmediaobject.cpp SOURCES += tst_qmediaobject.cpp
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qmediaplayer/qmediaplayer.pro
+1
View File
@@ -5,3 +5,4 @@ SOURCES += tst_qmediaplayer.cpp
include (../qmultimedia_common/mock.pri) include (../qmultimedia_common/mock.pri)
include (../qmultimedia_common/mockplayer.pri) include (../qmultimedia_common/mockplayer.pri)
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qmediaplayerwidgets/qmediaplayerwidgets.pro
+1
View File
@@ -5,3 +5,4 @@ SOURCES += tst_qmediaplayerwidgets.cpp
include (../qmultimedia_common/mock.pri) include (../qmultimedia_common/mock.pri)
include (../qmultimedia_common/mockplayer.pri) include (../qmultimedia_common/mockplayer.pri)
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qmediaplaylist/qmediaplaylist.pro
+1
View File
@@ -16,3 +16,4 @@ SOURCES += \
INCLUDEPATH += $$QT.multimedia.sources/../plugins/m3u INCLUDEPATH += $$QT.multimedia.sources/../plugins/m3u
TESTDATA += testdata/* TESTDATA += testdata/*
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qmediaplaylistnavigator/qmediaplaylistnavigator.pro
+1
View File
@@ -6,3 +6,4 @@ CONFIG += no_private_qt_headers_warning
SOURCES += tst_qmediaplaylistnavigator.cpp SOURCES += tst_qmediaplaylistnavigator.cpp
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qmediapluginloader/qmediapluginloader.pro
+1
View File
@@ -12,3 +12,4 @@ wince* {
DEPLOYMENT += PLUGIN_DEPLOY DEPLOYMENT += PLUGIN_DEPLOY
} }
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qmediarecorder/qmediarecorder.pro
+1
View File
@@ -5,3 +5,4 @@ SOURCES += tst_qmediarecorder.cpp
include (../qmultimedia_common/mock.pri) include (../qmultimedia_common/mock.pri)
include (../qmultimedia_common/mockrecorder.pri) include (../qmultimedia_common/mockrecorder.pri)
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qmediaresource/qmediaresource.pro
+1
View File
@@ -6,3 +6,4 @@ CONFIG += no_private_qt_headers_warning
SOURCES += tst_qmediaresource.cpp SOURCES += tst_qmediaresource.cpp
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qmediaservice/qmediaservice.pro
+1
View File
@@ -5,3 +5,4 @@ QT += multimedia-private testlib
CONFIG += no_private_qt_headers_warning CONFIG += no_private_qt_headers_warning
SOURCES += tst_qmediaservice.cpp SOURCES += tst_qmediaservice.cpp
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro
+1
View File
@@ -23,3 +23,4 @@ OTHER_FILES += mockserviceplugin1.json
target.path += $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE} target.path += $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE}
INSTALLS += target INSTALLS += target
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro
+1
View File
@@ -23,3 +23,4 @@ OTHER_FILES += mockserviceplugin2.json
target.path += $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE} target.path += $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE}
INSTALLS += target INSTALLS += target
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro
+1
View File
@@ -23,3 +23,4 @@ OTHER_FILES += mockserviceplugin3.json
target.path += $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE} target.path += $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE}
INSTALLS += target INSTALLS += target
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro
+1
View File
@@ -23,3 +23,4 @@ OTHER_FILES += mockserviceplugin4.json
target.path += $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE} target.path += $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE}
INSTALLS += target INSTALLS += target
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qmediaserviceprovider/test/test.pro
+1
View File
@@ -16,3 +16,4 @@ win32 {
mac: CONFIG -= app_bundle mac: CONFIG -= app_bundle
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qmediatimerange/qmediatimerange.pro
+1
View File
@@ -6,3 +6,4 @@ CONFIG += no_private_qt_headers_warning
SOURCES += tst_qmediatimerange.cpp SOURCES += tst_qmediatimerange.cpp
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qmetadatareadercontrol/qmetadatareadercontrol.pro
+1
View File
@@ -8,3 +8,4 @@ SOURCES += tst_qmetadatareadercontrol.cpp
include (../qmultimedia_common/mockcontainer.pri) include (../qmultimedia_common/mockcontainer.pri)
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qmetadatawritercontrol/qmetadatawritercontrol.pro
+1
View File
@@ -7,3 +7,4 @@ CONFIG += no_private_qt_headers_warning
SOURCES += tst_qmetadatawritercontrol.cpp SOURCES += tst_qmetadatawritercontrol.cpp
include (../qmultimedia_common/mockcontainer.pri) include (../qmultimedia_common/mockcontainer.pri)
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro
+1
View File
@@ -14,3 +14,4 @@ contains(QT_CONFIG, opengl): QT += opengl
SOURCES += tst_qpaintervideosurface.cpp SOURCES += tst_qpaintervideosurface.cpp
QT+=widgets QT+=widgets
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qradiodata/qradiodata.pro
+1
View File
@@ -5,3 +5,4 @@ SOURCES += tst_qradiodata.cpp
include (../qmultimedia_common/mock.pri) include (../qmultimedia_common/mock.pri)
include (../qmultimedia_common/mockradio.pri) include (../qmultimedia_common/mockradio.pri)
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qradiotuner/qradiotuner.pro
+1
View File
@@ -5,3 +5,4 @@ SOURCES += tst_qradiotuner.cpp
include (../qmultimedia_common/mock.pri) include (../qmultimedia_common/mock.pri)
include (../qmultimedia_common/mockradio.pri) include (../qmultimedia_common/mockradio.pri)
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qsamplecache/qsamplecache.pro
+1
View File
@@ -6,3 +6,4 @@ QT += multimedia-private testlib
SOURCES += tst_qsamplecache.cpp SOURCES += tst_qsamplecache.cpp
TESTDATA += testdata/* TESTDATA += testdata/*
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qvideoencodersettingscontrol/qvideoencodersettingscontrol.pro
+1
View File
@@ -7,3 +7,4 @@ CONFIG += no_private_qt_headers_warning
SOURCES += \ SOURCES += \
tst_qvideoencodersettingscontrol.cpp tst_qvideoencodersettingscontrol.cpp
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qvideoframe/qvideoframe.pro
+1
View File
@@ -6,3 +6,4 @@ CONFIG += no_private_qt_headers_warning
SOURCES += tst_qvideoframe.cpp SOURCES += tst_qvideoframe.cpp
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qvideoprobe/qvideoprobe.pro
+1
View File
@@ -8,3 +8,4 @@ SOURCES += tst_qvideoprobe.cpp
include (../qmultimedia_common/mock.pri) include (../qmultimedia_common/mock.pri)
include (../qmultimedia_common/mockrecorder.pri) include (../qmultimedia_common/mockrecorder.pri)
include (../qmultimedia_common/mockplayer.pri) include (../qmultimedia_common/mockplayer.pri)
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qvideosurfaceformat/qvideosurfaceformat.pro
+1
View File
@@ -6,3 +6,4 @@ CONFIG += no_private_qt_headers_warning
SOURCES += tst_qvideosurfaceformat.cpp SOURCES += tst_qvideosurfaceformat.cpp
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qvideowidget/qvideowidget.pro
+1
View File
@@ -7,3 +7,4 @@ CONFIG += no_private_qt_headers_warning
SOURCES += tst_qvideowidget.cpp SOURCES += tst_qvideowidget.cpp
QT+=widgets QT+=widgets
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
tests/auto/unit/qwavedecoder/qwavedecoder.pro
+1
View File
@@ -7,3 +7,4 @@ QT += multimedia-private testlib network
CONFIG += no_private_qt_headers_warning testcase CONFIG += no_private_qt_headers_warning testcase
TESTDATA += data/* TESTDATA += data/*
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0