diff options
Diffstat (limited to 'tests/auto/unit')
49 files changed, 6 insertions, 54 deletions
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 |