From 672b5b7ab668c67477d36edfcda98caafd35edc0 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 1 Aug 2012 13:19:40 +0200 Subject: 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: I8129c3ef3cb58541c95a32d083850d9e7f768927 Reviewed-by: Lars Knoll Reviewed-by: Olivier Goffart --- tests/auto/other/atwrapper/atWrapper.pro | 1 + tests/auto/other/baselineexample/baselineexample.pro | 1 + tests/auto/other/collections/collections.pro | 1 + tests/auto/other/compiler/compiler.pro | 1 + tests/auto/other/exceptionsafety/exceptionsafety.pro | 1 + tests/auto/other/exceptionsafety_objects/exceptionsafety_objects.pro | 1 + tests/auto/other/gestures/gestures.pro | 1 + tests/auto/other/headersclean/headersclean.pro | 1 + tests/auto/other/lancelot/lancelot.pro | 1 + tests/auto/other/languagechange/languagechange.pro | 1 + tests/auto/other/macgui/macgui.pro | 1 + tests/auto/other/macnativeevents/macnativeevents.pro | 1 + tests/auto/other/macplist/app/app.pro | 1 + tests/auto/other/macplist/test/test.pro | 1 + tests/auto/other/modeltest/modeltest.pro | 1 + tests/auto/other/networkselftest/networkselftest.pro | 1 + tests/auto/other/qaccessibility/qaccessibility.pro | 1 + tests/auto/other/qcomplextext/qcomplextext.pro | 1 + tests/auto/other/qfocusevent/qfocusevent.pro | 1 + .../qnetworkaccessmanager_and_qprogressdialog.pro | 1 + tests/auto/other/qobjectperformance/qobjectperformance.pro | 1 + tests/auto/other/qobjectrace/qobjectrace.pro | 1 + .../auto/other/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro | 1 + tests/auto/other/qtokenautomaton/qtokenautomaton.pro | 1 + tests/auto/other/windowsmobile/test/test.pro | 1 + tests/auto/other/windowsmobile/testQMenuBar/testQMenuBar.pro | 1 + 26 files changed, 26 insertions(+) (limited to 'tests/auto/other') diff --git a/tests/auto/other/atwrapper/atWrapper.pro b/tests/auto/other/atwrapper/atWrapper.pro index 9de320b364..d14293302e 100644 --- a/tests/auto/other/atwrapper/atWrapper.pro +++ b/tests/auto/other/atwrapper/atWrapper.pro @@ -18,3 +18,4 @@ SOURCES += atWrapperAutotest.cpp atWrapper.cpp TARGET = tst_atwrapper #include($$COMMON_FOLDER/common.pri) +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/other/baselineexample/baselineexample.pro b/tests/auto/other/baselineexample/baselineexample.pro index cc310aec3a..c1c4b31bfe 100644 --- a/tests/auto/other/baselineexample/baselineexample.pro +++ b/tests/auto/other/baselineexample/baselineexample.pro @@ -16,3 +16,4 @@ SOURCES += tst_baselineexample.cpp DEFINES += SRCDIR=\\\"$$PWD/\\\" include($$PWD/../../../baselineserver/shared/qbaselinetest.pri) +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/other/collections/collections.pro b/tests/auto/other/collections/collections.pro index 292c4e794d..51ea667f58 100644 --- a/tests/auto/other/collections/collections.pro +++ b/tests/auto/other/collections/collections.pro @@ -6,3 +6,4 @@ CONFIG += parallel_test # This test does not work with strict iterators DEFINES -= QT_STRICT_ITERATORS +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/other/compiler/compiler.pro b/tests/auto/other/compiler/compiler.pro index e6307ac9ec..8ebcf60bc0 100644 --- a/tests/auto/other/compiler/compiler.pro +++ b/tests/auto/other/compiler/compiler.pro @@ -6,3 +6,4 @@ QT = core testlib +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/other/exceptionsafety/exceptionsafety.pro b/tests/auto/other/exceptionsafety/exceptionsafety.pro index 66abe49758..558c1d6636 100644 --- a/tests/auto/other/exceptionsafety/exceptionsafety.pro +++ b/tests/auto/other/exceptionsafety/exceptionsafety.pro @@ -3,3 +3,4 @@ TARGET = tst_exceptionsafety SOURCES += tst_exceptionsafety.cpp QT = core testlib CONFIG += parallel_test +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/other/exceptionsafety_objects/exceptionsafety_objects.pro b/tests/auto/other/exceptionsafety_objects/exceptionsafety_objects.pro index adb9bfc1f8..665ca99e41 100644 --- a/tests/auto/other/exceptionsafety_objects/exceptionsafety_objects.pro +++ b/tests/auto/other/exceptionsafety_objects/exceptionsafety_objects.pro @@ -3,3 +3,4 @@ TARGET = tst_exceptionsafety_objects QT += widgets testlib HEADERS += oomsimulator.h 3rdparty/valgrind.h 3rdparty/memcheck.h SOURCES += tst_exceptionsafety_objects.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/other/gestures/gestures.pro b/tests/auto/other/gestures/gestures.pro index 0ec0435f62..a4e78ef4b4 100644 --- a/tests/auto/other/gestures/gestures.pro +++ b/tests/auto/other/gestures/gestures.pro @@ -2,3 +2,4 @@ CONFIG += testcase TARGET = tst_gestures QT += widgets testlib SOURCES += tst_gestures.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/other/headersclean/headersclean.pro b/tests/auto/other/headersclean/headersclean.pro index 9bfadca08c..419c2e97d5 100644 --- a/tests/auto/other/headersclean/headersclean.pro +++ b/tests/auto/other/headersclean/headersclean.pro @@ -1,2 +1,3 @@ QT = core testlib gui widgets include(headersclean.pri) +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/other/lancelot/lancelot.pro b/tests/auto/other/lancelot/lancelot.pro index 2a02b923f0..b01e73a2c9 100644 --- a/tests/auto/other/lancelot/lancelot.pro +++ b/tests/auto/other/lancelot/lancelot.pro @@ -12,3 +12,4 @@ RESOURCES += images.qrc include($$PWD/../../../baselineserver/shared/qbaselinetest.pri) TESTDATA += scripts/* +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/other/languagechange/languagechange.pro b/tests/auto/other/languagechange/languagechange.pro index 25dbcc19be..0b9c04d2ed 100644 --- a/tests/auto/other/languagechange/languagechange.pro +++ b/tests/auto/other/languagechange/languagechange.pro @@ -4,3 +4,4 @@ win32:testcase.timeout = 1800 # test runtime varies greatly on Windows, QTBUG- TARGET = tst_languagechange QT += widgets core-private gui-private testlib SOURCES += tst_languagechange.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/other/macgui/macgui.pro b/tests/auto/other/macgui/macgui.pro index b557806555..bf805ccd75 100644 --- a/tests/auto/other/macgui/macgui.pro +++ b/tests/auto/other/macgui/macgui.pro @@ -7,3 +7,4 @@ HEADERS += guitest.h QT = core-private widgets-private testlib requires(mac) +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/other/macnativeevents/macnativeevents.pro b/tests/auto/other/macnativeevents/macnativeevents.pro index d72a87f205..e958f414e0 100644 --- a/tests/auto/other/macnativeevents/macnativeevents.pro +++ b/tests/auto/other/macnativeevents/macnativeevents.pro @@ -9,3 +9,4 @@ SOURCES += tst_macnativeevents.cpp requires(mac) CONFIG += insignificant_test # QTBUG-22775 +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/other/macplist/app/app.pro b/tests/auto/other/macplist/app/app.pro index 9ccac831d0..c4dfedb104 100644 --- a/tests/auto/other/macplist/app/app.pro +++ b/tests/auto/other/macplist/app/app.pro @@ -1,3 +1,4 @@ QT += widgets SOURCES += main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/other/macplist/test/test.pro b/tests/auto/other/macplist/test/test.pro index 5018abeca9..6dad17ab67 100644 --- a/tests/auto/other/macplist/test/test.pro +++ b/tests/auto/other/macplist/test/test.pro @@ -10,3 +10,4 @@ win32 { TARGET = ../../release/tst_macplist } } +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/other/modeltest/modeltest.pro b/tests/auto/other/modeltest/modeltest.pro index b29fb862c7..045299e095 100644 --- a/tests/auto/other/modeltest/modeltest.pro +++ b/tests/auto/other/modeltest/modeltest.pro @@ -6,3 +6,4 @@ HEADERS += modeltest.h dynamictreemodel.h +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/other/networkselftest/networkselftest.pro b/tests/auto/other/networkselftest/networkselftest.pro index 1c0d256dbb..37c8712603 100644 --- a/tests/auto/other/networkselftest/networkselftest.pro +++ b/tests/auto/other/networkselftest/networkselftest.pro @@ -4,3 +4,4 @@ TARGET = tst_networkselftest SOURCES += tst_networkselftest.cpp QT = core network testlib +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/other/qaccessibility/qaccessibility.pro b/tests/auto/other/qaccessibility/qaccessibility.pro index ac8b6c87a8..13c9c361ce 100644 --- a/tests/auto/other/qaccessibility/qaccessibility.pro +++ b/tests/auto/other/qaccessibility/qaccessibility.pro @@ -19,3 +19,4 @@ win32 { } LIBS += -loleacc -loleaut32 -lole32 } +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/other/qcomplextext/qcomplextext.pro b/tests/auto/other/qcomplextext/qcomplextext.pro index 92505f728e..f6c0c261be 100644 --- a/tests/auto/other/qcomplextext/qcomplextext.pro +++ b/tests/auto/other/qcomplextext/qcomplextext.pro @@ -5,3 +5,4 @@ QT += widgets widgets-private testlib QT += core-private gui-private SOURCES += tst_qcomplextext.cpp INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/other/qfocusevent/qfocusevent.pro b/tests/auto/other/qfocusevent/qfocusevent.pro index 5f799291c6..c6e31d2e50 100644 --- a/tests/auto/other/qfocusevent/qfocusevent.pro +++ b/tests/auto/other/qfocusevent/qfocusevent.pro @@ -2,3 +2,4 @@ CONFIG += testcase TARGET = tst_qfocusevent QT += widgets testlib SOURCES += tst_qfocusevent.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro b/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro index accf6c1cef..e34990d513 100644 --- a/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro +++ b/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro @@ -3,3 +3,4 @@ CONFIG += parallel_test TARGET = tst_qnetworkaccessmanager_and_qprogressdialog SOURCES += tst_qnetworkaccessmanager_and_qprogressdialog.cpp QT += network widgets testlib +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/other/qobjectperformance/qobjectperformance.pro b/tests/auto/other/qobjectperformance/qobjectperformance.pro index 189f8eeb2a..78423bee9c 100644 --- a/tests/auto/other/qobjectperformance/qobjectperformance.pro +++ b/tests/auto/other/qobjectperformance/qobjectperformance.pro @@ -5,3 +5,4 @@ SOURCES += tst_qobjectperformance.cpp QT = core network testlib +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/other/qobjectrace/qobjectrace.pro b/tests/auto/other/qobjectrace/qobjectrace.pro index 9a0d8e58c4..b5848edb01 100644 --- a/tests/auto/other/qobjectrace/qobjectrace.pro +++ b/tests/auto/other/qobjectrace/qobjectrace.pro @@ -4,3 +4,4 @@ QT = core testlib TARGET.EPOCHEAPSIZE = 20000000 40000000 CONFIG += parallel_test +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/other/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro b/tests/auto/other/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro index ff786ba53d..c7a4f3e216 100644 --- a/tests/auto/other/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro +++ b/tests/auto/other/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro @@ -4,3 +4,4 @@ TARGET = tst_qsharedpointer_and_qwidget QT += widgets testlib SOURCES += tst_qsharedpointer_and_qwidget.cpp DEFINES += SRCDIR=\\\"$$PWD/\\\" +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/other/qtokenautomaton/qtokenautomaton.pro b/tests/auto/other/qtokenautomaton/qtokenautomaton.pro index a4af4bc1c5..2c0b3dae9b 100644 --- a/tests/auto/other/qtokenautomaton/qtokenautomaton.pro +++ b/tests/auto/other/qtokenautomaton/qtokenautomaton.pro @@ -17,3 +17,4 @@ HEADERS += tokenizers/basic/basic.h \ QT = core testlib CONFIG += parallel_test +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/other/windowsmobile/test/test.pro b/tests/auto/other/windowsmobile/test/test.pro index 400f3d0616..5f744c2acb 100644 --- a/tests/auto/other/windowsmobile/test/test.pro +++ b/tests/auto/other/windowsmobile/test/test.pro @@ -22,3 +22,4 @@ wincewm*: { +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/other/windowsmobile/testQMenuBar/testQMenuBar.pro b/tests/auto/other/windowsmobile/testQMenuBar/testQMenuBar.pro index 6b84ae937c..12ef683c11 100644 --- a/tests/auto/other/windowsmobile/testQMenuBar/testQMenuBar.pro +++ b/tests/auto/other/windowsmobile/testQMenuBar/testQMenuBar.pro @@ -2,3 +2,4 @@ SOURCES += main.cpp QT += widgets TARGET = ../testQMenuBar +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 -- cgit v1.2.3