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/corelib/global/q_func_info/q_func_info.pro | 1 + tests/auto/corelib/global/qflags/qflags.pro | 1 + tests/auto/corelib/global/qgetputenv/qgetputenv.pro | 1 + tests/auto/corelib/global/qglobal/qglobal.pro | 1 + tests/auto/corelib/global/qlogging/app/app.pro | 1 + tests/auto/corelib/global/qlogging/test/test.pro | 1 + tests/auto/corelib/global/qnumeric/qnumeric.pro | 1 + tests/auto/corelib/global/qrand/qrand.pro | 1 + tests/auto/corelib/global/qtendian/qtendian.pro | 1 + 9 files changed, 9 insertions(+) (limited to 'tests/auto/corelib/global') diff --git a/tests/auto/corelib/global/q_func_info/q_func_info.pro b/tests/auto/corelib/global/q_func_info/q_func_info.pro index d3b906a9dd..aad0edf4ed 100644 --- a/tests/auto/corelib/global/q_func_info/q_func_info.pro +++ b/tests/auto/corelib/global/q_func_info/q_func_info.pro @@ -2,3 +2,4 @@ CONFIG += testcase parallel_test TARGET = tst_q_func_info QT = core testlib SOURCES = tst_q_func_info.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/global/qflags/qflags.pro b/tests/auto/corelib/global/qflags/qflags.pro index e5d1acb087..9e80d5634b 100644 --- a/tests/auto/corelib/global/qflags/qflags.pro +++ b/tests/auto/corelib/global/qflags/qflags.pro @@ -2,3 +2,4 @@ CONFIG += testcase parallel_test TARGET = tst_qflags QT = core testlib SOURCES = tst_qflags.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/global/qgetputenv/qgetputenv.pro b/tests/auto/corelib/global/qgetputenv/qgetputenv.pro index 039de7a87a..34fb1a702b 100644 --- a/tests/auto/corelib/global/qgetputenv/qgetputenv.pro +++ b/tests/auto/corelib/global/qgetputenv/qgetputenv.pro @@ -2,3 +2,4 @@ CONFIG += testcase parallel_test TARGET = tst_qgetputenv QT = core testlib SOURCES = tst_qgetputenv.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/global/qglobal/qglobal.pro b/tests/auto/corelib/global/qglobal/qglobal.pro index 0f26e9854b..d1c02f80e9 100644 --- a/tests/auto/corelib/global/qglobal/qglobal.pro +++ b/tests/auto/corelib/global/qglobal/qglobal.pro @@ -2,3 +2,4 @@ CONFIG += testcase parallel_test TARGET = tst_qglobal QT = core testlib SOURCES = tst_qglobal.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/global/qlogging/app/app.pro b/tests/auto/corelib/global/qlogging/app/app.pro index 1088d08a58..24ac571bac 100644 --- a/tests/auto/corelib/global/qlogging/app/app.pro +++ b/tests/auto/corelib/global/qlogging/app/app.pro @@ -9,3 +9,4 @@ CONFIG -= app_bundle CONFIG += console SOURCES += main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/global/qlogging/test/test.pro b/tests/auto/corelib/global/qlogging/test/test.pro index d791f9ca76..c75fc47f96 100644 --- a/tests/auto/corelib/global/qlogging/test/test.pro +++ b/tests/auto/corelib/global/qlogging/test/test.pro @@ -5,3 +5,4 @@ QT = core testlib SOURCES = ../tst_qlogging.cpp TEST_HELPER_INSTALLS = ../app/app +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/global/qnumeric/qnumeric.pro b/tests/auto/corelib/global/qnumeric/qnumeric.pro index cf2cc56ce6..4cfb3fa7ac 100644 --- a/tests/auto/corelib/global/qnumeric/qnumeric.pro +++ b/tests/auto/corelib/global/qnumeric/qnumeric.pro @@ -2,3 +2,4 @@ CONFIG += testcase parallel_test TARGET = tst_qnumeric QT = core testlib SOURCES = tst_qnumeric.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/global/qrand/qrand.pro b/tests/auto/corelib/global/qrand/qrand.pro index 911ff50ac1..7761b6721a 100644 --- a/tests/auto/corelib/global/qrand/qrand.pro +++ b/tests/auto/corelib/global/qrand/qrand.pro @@ -2,3 +2,4 @@ CONFIG += testcase parallel_test TARGET = tst_qrand QT = core testlib SOURCES = tst_qrand.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/global/qtendian/qtendian.pro b/tests/auto/corelib/global/qtendian/qtendian.pro index caad0fc764..470a363c09 100644 --- a/tests/auto/corelib/global/qtendian/qtendian.pro +++ b/tests/auto/corelib/global/qtendian/qtendian.pro @@ -2,3 +2,4 @@ CONFIG += testcase parallel_test TARGET = tst_qtendian QT = core testlib SOURCES = tst_qtendian.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 -- cgit v1.2.3