diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2012-08-01 15:09:24 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-01 23:33:45 +0200 |
commit | 3f605e23ba908f445b9ff340119337066e5e990c (patch) | |
tree | 4112c09646b487b3470f39d232acb2b13d1e8c31 | |
parent | 32959ce17c71d7629d78c65c6a94889e033b8b21 (diff) |
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: Ic47384e3ed17e5f7b7402757eb995bfa898656a8
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
61 files changed, 61 insertions, 0 deletions
diff --git a/tests/auto/imports/qcapsulemesh/qcapsulemesh.pro b/tests/auto/imports/qcapsulemesh/qcapsulemesh.pro index 0af344c03..272280cef 100644 --- a/tests/auto/imports/qcapsulemesh/qcapsulemesh.pro +++ b/tests/auto/imports/qcapsulemesh/qcapsulemesh.pro @@ -6,3 +6,4 @@ QT += qml quick CONFIG += warn_on SOURCES += tst_qcapsulemesh.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/imports/qcylindermesh/qcylindermesh.pro b/tests/auto/imports/qcylindermesh/qcylindermesh.pro index d2b1890f4..d42a32db2 100644 --- a/tests/auto/imports/qcylindermesh/qcylindermesh.pro +++ b/tests/auto/imports/qcylindermesh/qcylindermesh.pro @@ -6,3 +6,4 @@ QT += qml quick CONFIG += warn_on SOURCES += tst_qcylindermesh.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/imports/qline/qline.pro b/tests/auto/imports/qline/qline.pro index 323ec4b87..484d729b8 100644 --- a/tests/auto/imports/qline/qline.pro +++ b/tests/auto/imports/qline/qline.pro @@ -6,3 +6,4 @@ QT += qml quick CONFIG += warn_on SOURCES += tst_qline.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/imports/qpoint/qpoint.pro b/tests/auto/imports/qpoint/qpoint.pro index fa69729da..f214afd3b 100644 --- a/tests/auto/imports/qpoint/qpoint.pro +++ b/tests/auto/imports/qpoint/qpoint.pro @@ -6,3 +6,4 @@ QT += qml quick CONFIG += warn_on SOURCES += tst_qpoint.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/imports/qspheremesh/qspheremesh.pro b/tests/auto/imports/qspheremesh/qspheremesh.pro index d6e637353..65f40033b 100644 --- a/tests/auto/imports/qspheremesh/qspheremesh.pro +++ b/tests/auto/imports/qspheremesh/qspheremesh.pro @@ -6,3 +6,4 @@ QT += qml quick CONFIG += warn_on SOURCES += tst_qspheremesh.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qml3d/qml3d.pro b/tests/auto/qml3d/qml3d.pro index 64250bf26..57529ee9b 100644 --- a/tests/auto/qml3d/qml3d.pro +++ b/tests/auto/qml3d/qml3d.pro @@ -18,3 +18,4 @@ OTHER_FILES += \ item3d/tst_missing_texture_coordinates.qml \ item3d/tst_item3d_local_v_world.qml TESTDATA = $$OTHER_FILES +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qml3d_visual/qml3d_visual.pro b/tests/auto/qml3d_visual/qml3d_visual.pro index 553381cbb..b1bb24d6a 100644 --- a/tests/auto/qml3d_visual/qml3d_visual.pro +++ b/tests/auto/qml3d_visual/qml3d_visual.pro @@ -12,3 +12,4 @@ OTHER_FILES += \ picking/tst_picking.qml TESTDATA = $$OTHER_FILES +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/load_model/load_model.pro b/tests/auto/threed/load_model/load_model.pro index d8441cc2d..26b0d6192 100644 --- a/tests/auto/threed/load_model/load_model.pro +++ b/tests/auto/threed/load_model/load_model.pro @@ -8,3 +8,4 @@ SOURCES += tst_load_model.cpp RESOURCES += \ load_model.qrc +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qareaallocator/qareaallocator.pro b/tests/auto/threed/qareaallocator/qareaallocator.pro index 4df10826f..a443875e0 100644 --- a/tests/auto/threed/qareaallocator/qareaallocator.pro +++ b/tests/auto/threed/qareaallocator/qareaallocator.pro @@ -5,3 +5,4 @@ QT += testlib 3d CONFIG += warn_on SOURCES += tst_qareaallocator.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qarray/qarray.pro b/tests/auto/threed/qarray/qarray.pro index 695c766a3..773622d5f 100644 --- a/tests/auto/threed/qarray/qarray.pro +++ b/tests/auto/threed/qarray/qarray.pro @@ -5,3 +5,4 @@ QT += testlib 3d CONFIG += warn_on SOURCES += tst_qarray.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qbox3d/qbox3d.pro b/tests/auto/threed/qbox3d/qbox3d.pro index 3f19d0c57..645e8c846 100644 --- a/tests/auto/threed/qbox3d/qbox3d.pro +++ b/tests/auto/threed/qbox3d/qbox3d.pro @@ -5,3 +5,4 @@ QT += testlib 3d CONFIG += warn_on SOURCES += tst_qbox3d.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qcolor4ub/qcolor4ub.pro b/tests/auto/threed/qcolor4ub/qcolor4ub.pro index bfaad944b..5bc08f553 100644 --- a/tests/auto/threed/qcolor4ub/qcolor4ub.pro +++ b/tests/auto/threed/qcolor4ub/qcolor4ub.pro @@ -5,3 +5,4 @@ QT += testlib 3d CONFIG += warn_on SOURCES += tst_qcolor4ub.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qcustomdataarray/qcustomdataarray.pro b/tests/auto/threed/qcustomdataarray/qcustomdataarray.pro index d3168335d..ee89d639e 100644 --- a/tests/auto/threed/qcustomdataarray/qcustomdataarray.pro +++ b/tests/auto/threed/qcustomdataarray/qcustomdataarray.pro @@ -5,3 +5,4 @@ QT += testlib 3d CONFIG += warn_on SOURCES += tst_qcustomdataarray.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qgeometrydata/qgeometrydata.pro b/tests/auto/threed/qgeometrydata/qgeometrydata.pro index ae4e97afe..1f4b2d3e7 100644 --- a/tests/auto/threed/qgeometrydata/qgeometrydata.pro +++ b/tests/auto/threed/qgeometrydata/qgeometrydata.pro @@ -8,3 +8,4 @@ INCLUDEPATH += ../../../shared INCLUDEPATH += ../../../../src/threed/geometry SOURCES += tst_qgeometrydata.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qglabstractsurface/qglabstractsurface.pro b/tests/auto/threed/qglabstractsurface/qglabstractsurface.pro index a454f53cf..2ee122fe2 100644 --- a/tests/auto/threed/qglabstractsurface/qglabstractsurface.pro +++ b/tests/auto/threed/qglabstractsurface/qglabstractsurface.pro @@ -7,3 +7,4 @@ CONFIG += warn_on SOURCES += tst_qglabstractsurface.cpp CONFIG+=insignificant_test # See QTBUG-25277 +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qglattributedescription/qglattributedescription.pro b/tests/auto/threed/qglattributedescription/qglattributedescription.pro index e87d773a6..e2e5d7457 100644 --- a/tests/auto/threed/qglattributedescription/qglattributedescription.pro +++ b/tests/auto/threed/qglattributedescription/qglattributedescription.pro @@ -8,3 +8,4 @@ INCLUDEPATH += ../../../../threed/viewing VPATH += ../../../../threed/viewing SOURCES += tst_qglattributedescription.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qglattributeset/qglattributeset.pro b/tests/auto/threed/qglattributeset/qglattributeset.pro index ee7df94cd..5d0603802 100644 --- a/tests/auto/threed/qglattributeset/qglattributeset.pro +++ b/tests/auto/threed/qglattributeset/qglattributeset.pro @@ -5,3 +5,4 @@ QT += testlib 3d CONFIG += warn_on SOURCES += tst_qglattributeset.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qglattributevalue/qglattributevalue.pro b/tests/auto/threed/qglattributevalue/qglattributevalue.pro index 33307db61..0d84406b1 100644 --- a/tests/auto/threed/qglattributevalue/qglattributevalue.pro +++ b/tests/auto/threed/qglattributevalue/qglattributevalue.pro @@ -8,3 +8,4 @@ INCLUDEPATH += ../../../../threed/viewing VPATH += ../../../../threed/viewing SOURCES += tst_qglattributevalue.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qglbezierpatches/qglbezierpatches.pro b/tests/auto/threed/qglbezierpatches/qglbezierpatches.pro index 227264628..63677741d 100644 --- a/tests/auto/threed/qglbezierpatches/qglbezierpatches.pro +++ b/tests/auto/threed/qglbezierpatches/qglbezierpatches.pro @@ -5,3 +5,4 @@ QT += testlib 3d CONFIG += warn_on SOURCES += tst_qglbezierpatches.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qglbuilder/qglbuilder.pro b/tests/auto/threed/qglbuilder/qglbuilder.pro index c7b2ed7eb..8c365c215 100644 --- a/tests/auto/threed/qglbuilder/qglbuilder.pro +++ b/tests/auto/threed/qglbuilder/qglbuilder.pro @@ -7,3 +7,4 @@ CONFIG += warn_on INCLUDEPATH += ../../../shared SOURCES += tst_qglbuilder.cpp INCLUDEPATH += ../../../../src/threed/geometry +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qglcamera/qglcamera.pro b/tests/auto/threed/qglcamera/qglcamera.pro index c1703b296..a06d35c5b 100644 --- a/tests/auto/threed/qglcamera/qglcamera.pro +++ b/tests/auto/threed/qglcamera/qglcamera.pro @@ -9,3 +9,4 @@ VPATH += ../../../../threed/viewing SOURCES += \ tst_qglcamera.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qglcameraanimation/qglcameraanimation.pro b/tests/auto/threed/qglcameraanimation/qglcameraanimation.pro index 6eea0adbd..2f3df5ba4 100644 --- a/tests/auto/threed/qglcameraanimation/qglcameraanimation.pro +++ b/tests/auto/threed/qglcameraanimation/qglcameraanimation.pro @@ -8,3 +8,4 @@ INCLUDEPATH += ../../../../threed/viewing VPATH += ../../../../threed/viewing SOURCES += tst_qglcameraanimation.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qglcolladafxeffectfactory/qglcolladafxeffectfactory.pro b/tests/auto/threed/qglcolladafxeffectfactory/qglcolladafxeffectfactory.pro index e8afc8322..0ef9cea71 100644 --- a/tests/auto/threed/qglcolladafxeffectfactory/qglcolladafxeffectfactory.pro +++ b/tests/auto/threed/qglcolladafxeffectfactory/qglcolladafxeffectfactory.pro @@ -13,3 +13,4 @@ SOURCES += \ OTHER_FILES += collada_cube.xml RESOURCES += tst_qglcolladafxeffectfactory.qrc +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qglcube/qglcube.pro b/tests/auto/threed/qglcube/qglcube.pro index 810b65629..dd4edcacc 100644 --- a/tests/auto/threed/qglcube/qglcube.pro +++ b/tests/auto/threed/qglcube/qglcube.pro @@ -6,3 +6,4 @@ CONFIG += warn_on INCLUDEPATH += ../../../shared SOURCES += tst_qglcube.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qglcylinder/qglcylinder.pro b/tests/auto/threed/qglcylinder/qglcylinder.pro index 37f128a05..34effeaf1 100644 --- a/tests/auto/threed/qglcylinder/qglcylinder.pro +++ b/tests/auto/threed/qglcylinder/qglcylinder.pro @@ -6,3 +6,4 @@ CONFIG += warn_on INCLUDEPATH += ../../../shared SOURCES += tst_qglcylinder.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qglindexbuffer/qglindexbuffer.pro b/tests/auto/threed/qglindexbuffer/qglindexbuffer.pro index 151ff0ba1..c804f1000 100644 --- a/tests/auto/threed/qglindexbuffer/qglindexbuffer.pro +++ b/tests/auto/threed/qglindexbuffer/qglindexbuffer.pro @@ -5,3 +5,4 @@ QT += testlib 3d opengl CONFIG += warn_on SOURCES += tst_qglindexbuffer.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qgllightmodel/qgllightmodel.pro b/tests/auto/threed/qgllightmodel/qgllightmodel.pro index 367255b16..e61381bbf 100644 --- a/tests/auto/threed/qgllightmodel/qgllightmodel.pro +++ b/tests/auto/threed/qgllightmodel/qgllightmodel.pro @@ -5,3 +5,4 @@ QT += testlib 3d CONFIG += warn_on SOURCES += tst_qgllightmodel.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qgllightparameters/qgllightparameters.pro b/tests/auto/threed/qgllightparameters/qgllightparameters.pro index 40222cf8a..e940e4e75 100644 --- a/tests/auto/threed/qgllightparameters/qgllightparameters.pro +++ b/tests/auto/threed/qgllightparameters/qgllightparameters.pro @@ -5,3 +5,4 @@ QT += testlib 3d CONFIG += warn_on SOURCES += tst_qgllightparameters.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qglmaterial/qglmaterial.pro b/tests/auto/threed/qglmaterial/qglmaterial.pro index 5bad31f83..fcefbe64f 100644 --- a/tests/auto/threed/qglmaterial/qglmaterial.pro +++ b/tests/auto/threed/qglmaterial/qglmaterial.pro @@ -6,3 +6,4 @@ CONFIG += warn_on CONFIG += insignificant_test # See QTBUG-25757 SOURCES += tst_qglmaterial.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qglmaterialcollection/qglmaterialcollection.pro b/tests/auto/threed/qglmaterialcollection/qglmaterialcollection.pro index c88798827..8e0a5ed74 100644 --- a/tests/auto/threed/qglmaterialcollection/qglmaterialcollection.pro +++ b/tests/auto/threed/qglmaterialcollection/qglmaterialcollection.pro @@ -5,3 +5,4 @@ QT += testlib 3d CONFIG += warn_on SOURCES += tst_qglmaterialcollection.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qglpainter/qglpainter.pro b/tests/auto/threed/qglpainter/qglpainter.pro index 5627bed9b..1a7fd7266 100644 --- a/tests/auto/threed/qglpainter/qglpainter.pro +++ b/tests/auto/threed/qglpainter/qglpainter.pro @@ -14,3 +14,4 @@ SOURCES += tst_qglpainter.cpp \ HEADERS += qgltestwidget.h \ compareimage.h \ qglsimulator.h +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qglpickcolors/qglpickcolors.pro b/tests/auto/threed/qglpickcolors/qglpickcolors.pro index ab665990e..c0abf6a7d 100644 --- a/tests/auto/threed/qglpickcolors/qglpickcolors.pro +++ b/tests/auto/threed/qglpickcolors/qglpickcolors.pro @@ -13,3 +13,4 @@ SOURCES += \ HEADERS += \ qglpickcolors_p.h +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qglrender/qglrender.pro b/tests/auto/threed/qglrender/qglrender.pro index 9c0c5f582..85d0e5e99 100644 --- a/tests/auto/threed/qglrender/qglrender.pro +++ b/tests/auto/threed/qglrender/qglrender.pro @@ -5,3 +5,4 @@ QT += testlib 3d CONFIG += warn_on SOURCES += tst_qglrender.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qglscenenode/qglscenenode.pro b/tests/auto/threed/qglscenenode/qglscenenode.pro index 1aa8f9546..51886eb11 100644 --- a/tests/auto/threed/qglscenenode/qglscenenode.pro +++ b/tests/auto/threed/qglscenenode/qglscenenode.pro @@ -6,3 +6,4 @@ CONFIG += warn_on INCLUDEPATH += ../../../shared SOURCES += tst_qglscenenode.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qglsection/qglsection.pro b/tests/auto/threed/qglsection/qglsection.pro index b8564628e..4595c9281 100644 --- a/tests/auto/threed/qglsection/qglsection.pro +++ b/tests/auto/threed/qglsection/qglsection.pro @@ -7,3 +7,4 @@ CONFIG += warn_on INCLUDEPATH += ../../../shared SOURCES += tst_qglsection.cpp INCLUDEPATH += ../../../../src/threed/geometry +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qglsphere/qglsphere.pro b/tests/auto/threed/qglsphere/qglsphere.pro index 41fad7e86..9cfb564a1 100644 --- a/tests/auto/threed/qglsphere/qglsphere.pro +++ b/tests/auto/threed/qglsphere/qglsphere.pro @@ -6,3 +6,4 @@ CONFIG += warn_on INCLUDEPATH += ../../../shared SOURCES += tst_qglsphere.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qglvertexbundle/qglvertexbundle.pro b/tests/auto/threed/qglvertexbundle/qglvertexbundle.pro index dfb20d5b6..fd8b07168 100644 --- a/tests/auto/threed/qglvertexbundle/qglvertexbundle.pro +++ b/tests/auto/threed/qglvertexbundle/qglvertexbundle.pro @@ -5,3 +5,4 @@ QT += testlib 3d opengl CONFIG += warn_on SOURCES += tst_qglvertexbundle.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qgraphicstransform3d/qgraphicstransform3d.pro b/tests/auto/threed/qgraphicstransform3d/qgraphicstransform3d.pro index 7fb934a9a..3907613b5 100644 --- a/tests/auto/threed/qgraphicstransform3d/qgraphicstransform3d.pro +++ b/tests/auto/threed/qgraphicstransform3d/qgraphicstransform3d.pro @@ -5,3 +5,4 @@ QT += testlib 3d CONFIG += warn_on SOURCES += tst_qgraphicstransform3d.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qplane3d/qplane3d.pro b/tests/auto/threed/qplane3d/qplane3d.pro index 39513a960..6899d04e9 100644 --- a/tests/auto/threed/qplane3d/qplane3d.pro +++ b/tests/auto/threed/qplane3d/qplane3d.pro @@ -5,3 +5,4 @@ QT += testlib 3d CONFIG += warn_on SOURCES += tst_qplane3d.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qray3d/qray3d.pro b/tests/auto/threed/qray3d/qray3d.pro index 058fc46c3..df877ebe3 100644 --- a/tests/auto/threed/qray3d/qray3d.pro +++ b/tests/auto/threed/qray3d/qray3d.pro @@ -4,3 +4,4 @@ TEMPLATE = app QT += testlib 3d CONFIG += warn_on SOURCES += tst_qray3d.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qsphere3d/qsphere3d.pro b/tests/auto/threed/qsphere3d/qsphere3d.pro index b4e39b4ab..747a72b64 100644 --- a/tests/auto/threed/qsphere3d/qsphere3d.pro +++ b/tests/auto/threed/qsphere3d/qsphere3d.pro @@ -4,3 +4,4 @@ TEMPLATE=app QT += testlib 3d CONFIG += warn_on SOURCES += tst_qsphere3d.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qstereoimage/qstereoimage.pro b/tests/auto/threed/qstereoimage/qstereoimage.pro index 15a8c87c2..cfdf3753f 100644 --- a/tests/auto/threed/qstereoimage/qstereoimage.pro +++ b/tests/auto/threed/qstereoimage/qstereoimage.pro @@ -9,3 +9,4 @@ VPATH += ../../../../examples/stereophoto HEADERS += qstereoimage.h SOURCES += tst_qstereoimage.cpp qstereoimage.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qtriangle3d/qtriangle3d.pro b/tests/auto/threed/qtriangle3d/qtriangle3d.pro index a14a79196..87c7e3cb2 100644 --- a/tests/auto/threed/qtriangle3d/qtriangle3d.pro +++ b/tests/auto/threed/qtriangle3d/qtriangle3d.pro @@ -5,3 +5,4 @@ QT += testlib 3d CONFIG += warn_on SOURCES += tst_qtriangle3d.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qvectorarray/qvectorarray.pro b/tests/auto/threed/qvectorarray/qvectorarray.pro index 3a3e8da32..9f54c3079 100644 --- a/tests/auto/threed/qvectorarray/qvectorarray.pro +++ b/tests/auto/threed/qvectorarray/qvectorarray.pro @@ -7,3 +7,4 @@ CONFIG += warn_on INCLUDEPATH += ../../../shared SOURCES += tst_qvectorarray.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/matrix_properties/matrix_properties.pro b/tests/benchmarks/matrix_properties/matrix_properties.pro index 0c82ce301..2acec5076 100644 --- a/tests/benchmarks/matrix_properties/matrix_properties.pro +++ b/tests/benchmarks/matrix_properties/matrix_properties.pro @@ -10,3 +10,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/qarray/qarray.pro b/tests/benchmarks/qarray/qarray.pro index 8fccb040b..018c7a5cc 100644 --- a/tests/benchmarks/qarray/qarray.pro +++ b/tests/benchmarks/qarray/qarray.pro @@ -3,3 +3,4 @@ QT += testlib 3d CONFIG += warn_on SOURCES += tst_qarray.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/qglbuilder_perf/qglbuilder_perf.pro b/tests/benchmarks/qglbuilder_perf/qglbuilder_perf.pro index 54c0610c9..62bb8f227 100644 --- a/tests/benchmarks/qglbuilder_perf/qglbuilder_perf.pro +++ b/tests/benchmarks/qglbuilder_perf/qglbuilder_perf.pro @@ -4,3 +4,4 @@ CONFIG += warn_on SOURCES += tst_qglbuilder_perf.cpp INCLUDEPATH += $$QT.3d.sources/geometry +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/animations/animations.pro b/tests/manual/animations/animations.pro index c1fdf1286..e9c660a11 100644 --- a/tests/manual/animations/animations.pro +++ b/tests/manual/animations/animations.pro @@ -21,3 +21,4 @@ include(../../../pkg.pri) OTHER_FILES += \ $$QML_INFRA_FILES +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/background/background.pro b/tests/manual/background/background.pro index c6ca92c43..9d351720e 100644 --- a/tests/manual/background/background.pro +++ b/tests/manual/background/background.pro @@ -20,3 +20,4 @@ include(../../../pkg.pri) OTHER_FILES += \ $$QML_INFRA_FILES +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/basic/basic.pro b/tests/manual/basic/basic.pro index 812e4d462..e42ba083e 100644 --- a/tests/manual/basic/basic.pro +++ b/tests/manual/basic/basic.pro @@ -19,3 +19,4 @@ include(../../../pkg.pri) OTHER_FILES += \ $$QML_INFRA_FILES +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/displaymodel/displaymodel.pro b/tests/manual/displaymodel/displaymodel.pro index b7245ea23..81d1020a9 100644 --- a/tests/manual/displaymodel/displaymodel.pro +++ b/tests/manual/displaymodel/displaymodel.pro @@ -26,3 +26,4 @@ include(../../../pkg.pri) OTHER_FILES += \ $$QML_INFRA_FILES +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/fullreferencing/fullreferencing.pro b/tests/manual/fullreferencing/fullreferencing.pro index 79bddb0ed..86cb3a5ec 100644 --- a/tests/manual/fullreferencing/fullreferencing.pro +++ b/tests/manual/fullreferencing/fullreferencing.pro @@ -23,3 +23,4 @@ include(../../../pkg.pri) OTHER_FILES += \ $$QML_INFRA_FILES +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/model3ds/model3ds.pro b/tests/manual/model3ds/model3ds.pro index e174ef957..c5e00e6a6 100644 --- a/tests/manual/model3ds/model3ds.pro +++ b/tests/manual/model3ds/model3ds.pro @@ -27,3 +27,4 @@ include(../../../pkg.pri) OTHER_FILES += \ $$QML_INFRA_FILES +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/navigation1/navigation1.pro b/tests/manual/navigation1/navigation1.pro index fd5c322cb..b26b70a9b 100644 --- a/tests/manual/navigation1/navigation1.pro +++ b/tests/manual/navigation1/navigation1.pro @@ -23,3 +23,4 @@ include(../../../pkg.pri) OTHER_FILES += \ $$QML_INFRA_FILES +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/qrc/qrc.pro b/tests/manual/qrc/qrc.pro index 88d7baed4..2a084a69b 100644 --- a/tests/manual/qrc/qrc.pro +++ b/tests/manual/qrc/qrc.pro @@ -25,3 +25,4 @@ OTHER_FILES += \ RESOURCES += \ qrc.qrc +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/rotation/rotation.pro b/tests/manual/rotation/rotation.pro index eaa562721..f3a63308e 100644 --- a/tests/manual/rotation/rotation.pro +++ b/tests/manual/rotation/rotation.pro @@ -21,3 +21,4 @@ include(../../../pkg.pri) OTHER_FILES += \ $$QML_INFRA_FILES +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/scaling/scaling.pro b/tests/manual/scaling/scaling.pro index 5d3899df3..00518798f 100644 --- a/tests/manual/scaling/scaling.pro +++ b/tests/manual/scaling/scaling.pro @@ -21,3 +21,4 @@ include(../../../pkg.pri) OTHER_FILES += \ $$QML_INFRA_FILES +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/shapes/shapes.pro b/tests/manual/shapes/shapes.pro index c440e5bc1..5b556a5d7 100644 --- a/tests/manual/shapes/shapes.pro +++ b/tests/manual/shapes/shapes.pro @@ -20,3 +20,4 @@ include(../../../pkg.pri) OTHER_FILES += \ $$QML_INFRA_FILES +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/submesh/submesh.pro b/tests/manual/submesh/submesh.pro index a2d881d84..9d5e7af83 100644 --- a/tests/manual/submesh/submesh.pro +++ b/tests/manual/submesh/submesh.pro @@ -23,3 +23,4 @@ include(../../../pkg.pri) OTHER_FILES += \ $$QML_INFRA_FILES +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/transformations/transformations.pro b/tests/manual/transformations/transformations.pro index d20ef7a28..3968a7225 100644 --- a/tests/manual/transformations/transformations.pro +++ b/tests/manual/transformations/transformations.pro @@ -22,3 +22,4 @@ include(../../../pkg.pri) OTHER_FILES += \ $$QML_INFRA_FILES +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/manual/translation/translation.pro b/tests/manual/translation/translation.pro index ebf662cae..a2119bdb3 100644 --- a/tests/manual/translation/translation.pro +++ b/tests/manual/translation/translation.pro @@ -23,3 +23,4 @@ include(../../../pkg.pri) OTHER_FILES += \ $$QML_INFRA_FILES +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 |