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/thread/qatomicint/qatomicint.pro | 1 + tests/auto/corelib/thread/qatomicpointer/qatomicpointer.pro | 1 + tests/auto/corelib/thread/qmutex/qmutex.pro | 1 + tests/auto/corelib/thread/qmutexlocker/qmutexlocker.pro | 1 + tests/auto/corelib/thread/qreadlocker/qreadlocker.pro | 1 + tests/auto/corelib/thread/qreadwritelock/qreadwritelock.pro | 1 + tests/auto/corelib/thread/qsemaphore/qsemaphore.pro | 1 + tests/auto/corelib/thread/qthread/qthread.pro | 1 + tests/auto/corelib/thread/qthreadonce/qthreadonce.pro | 1 + tests/auto/corelib/thread/qthreadpool/qthreadpool.pro | 1 + tests/auto/corelib/thread/qthreadstorage/crashonexit/crashonexit.pro | 1 + tests/auto/corelib/thread/qthreadstorage/test/test.pro | 1 + tests/auto/corelib/thread/qwaitcondition/qwaitcondition.pro | 1 + tests/auto/corelib/thread/qwritelocker/qwritelocker.pro | 1 + 14 files changed, 14 insertions(+) (limited to 'tests/auto/corelib/thread') diff --git a/tests/auto/corelib/thread/qatomicint/qatomicint.pro b/tests/auto/corelib/thread/qatomicint/qatomicint.pro index eb11268c08..1a3f7cc926 100644 --- a/tests/auto/corelib/thread/qatomicint/qatomicint.pro +++ b/tests/auto/corelib/thread/qatomicint/qatomicint.pro @@ -2,3 +2,4 @@ CONFIG += testcase parallel_test TARGET = tst_qatomicint QT = core testlib SOURCES = tst_qatomicint.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/thread/qatomicpointer/qatomicpointer.pro b/tests/auto/corelib/thread/qatomicpointer/qatomicpointer.pro index ea65ae52af..8468496d9c 100644 --- a/tests/auto/corelib/thread/qatomicpointer/qatomicpointer.pro +++ b/tests/auto/corelib/thread/qatomicpointer/qatomicpointer.pro @@ -2,3 +2,4 @@ CONFIG += testcase parallel_test TARGET = tst_qatomicpointer QT = core testlib SOURCES = tst_qatomicpointer.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/thread/qmutex/qmutex.pro b/tests/auto/corelib/thread/qmutex/qmutex.pro index 0b5b0b7fa0..dde0a7f88f 100644 --- a/tests/auto/corelib/thread/qmutex/qmutex.pro +++ b/tests/auto/corelib/thread/qmutex/qmutex.pro @@ -3,3 +3,4 @@ CONFIG += parallel_test TARGET = tst_qmutex QT = core testlib SOURCES = tst_qmutex.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/thread/qmutexlocker/qmutexlocker.pro b/tests/auto/corelib/thread/qmutexlocker/qmutexlocker.pro index a8b1fad7a4..d35eca1009 100644 --- a/tests/auto/corelib/thread/qmutexlocker/qmutexlocker.pro +++ b/tests/auto/corelib/thread/qmutexlocker/qmutexlocker.pro @@ -2,3 +2,4 @@ CONFIG += testcase parallel_test TARGET = tst_qmutexlocker QT = core testlib SOURCES = tst_qmutexlocker.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/thread/qreadlocker/qreadlocker.pro b/tests/auto/corelib/thread/qreadlocker/qreadlocker.pro index 4cda8d30c1..d391768102 100644 --- a/tests/auto/corelib/thread/qreadlocker/qreadlocker.pro +++ b/tests/auto/corelib/thread/qreadlocker/qreadlocker.pro @@ -2,3 +2,4 @@ CONFIG += testcase parallel_test TARGET = tst_qreadlocker QT = core testlib SOURCES = tst_qreadlocker.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/thread/qreadwritelock/qreadwritelock.pro b/tests/auto/corelib/thread/qreadwritelock/qreadwritelock.pro index 59f7d88f1f..b38d731049 100644 --- a/tests/auto/corelib/thread/qreadwritelock/qreadwritelock.pro +++ b/tests/auto/corelib/thread/qreadwritelock/qreadwritelock.pro @@ -2,3 +2,4 @@ CONFIG += testcase parallel_test TARGET = tst_qreadwritelock QT = core testlib SOURCES = tst_qreadwritelock.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/thread/qsemaphore/qsemaphore.pro b/tests/auto/corelib/thread/qsemaphore/qsemaphore.pro index 5a0f0337e6..56e9fd5da6 100644 --- a/tests/auto/corelib/thread/qsemaphore/qsemaphore.pro +++ b/tests/auto/corelib/thread/qsemaphore/qsemaphore.pro @@ -2,3 +2,4 @@ CONFIG += testcase TARGET = tst_qsemaphore QT = core testlib SOURCES = tst_qsemaphore.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/thread/qthread/qthread.pro b/tests/auto/corelib/thread/qthread/qthread.pro index cbaf01c14c..9efce4e7ed 100644 --- a/tests/auto/corelib/thread/qthread/qthread.pro +++ b/tests/auto/corelib/thread/qthread/qthread.pro @@ -2,3 +2,4 @@ CONFIG += testcase parallel_test TARGET = tst_qthread QT = core testlib SOURCES = tst_qthread.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/thread/qthreadonce/qthreadonce.pro b/tests/auto/corelib/thread/qthreadonce/qthreadonce.pro index 8fda1b71d7..2c189e7422 100644 --- a/tests/auto/corelib/thread/qthreadonce/qthreadonce.pro +++ b/tests/auto/corelib/thread/qthreadonce/qthreadonce.pro @@ -10,3 +10,4 @@ SOURCES = tst_qthreadonce.cpp # Temporary: SOURCES += qthreadonce.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/thread/qthreadpool/qthreadpool.pro b/tests/auto/corelib/thread/qthreadpool/qthreadpool.pro index 4d81218f24..387b79b012 100644 --- a/tests/auto/corelib/thread/qthreadpool/qthreadpool.pro +++ b/tests/auto/corelib/thread/qthreadpool/qthreadpool.pro @@ -2,3 +2,4 @@ CONFIG += testcase parallel_test TARGET = tst_qthreadpool QT = core testlib SOURCES = tst_qthreadpool.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/thread/qthreadstorage/crashonexit/crashonexit.pro b/tests/auto/corelib/thread/qthreadstorage/crashonexit/crashonexit.pro index 94a0a01e94..eb8d06d094 100644 --- a/tests/auto/corelib/thread/qthreadstorage/crashonexit/crashonexit.pro +++ b/tests/auto/corelib/thread/qthreadstorage/crashonexit/crashonexit.pro @@ -7,3 +7,4 @@ CONFIG += console # This app is testdata for tst_qthreadstorage target.path = $$[QT_INSTALL_TESTS]/tst_qthreadstorage/$$TARGET INSTALLS += target +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/thread/qthreadstorage/test/test.pro b/tests/auto/corelib/thread/qthreadstorage/test/test.pro index 729241f891..8b7caf1e24 100644 --- a/tests/auto/corelib/thread/qthreadstorage/test/test.pro +++ b/tests/auto/corelib/thread/qthreadstorage/test/test.pro @@ -7,3 +7,4 @@ SOURCES = ../tst_qthreadstorage.cpp TEST_HELPER_INSTALLS = ../crashonexit/crashonexit +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/thread/qwaitcondition/qwaitcondition.pro b/tests/auto/corelib/thread/qwaitcondition/qwaitcondition.pro index 0fb3b46d4b..7383997e67 100644 --- a/tests/auto/corelib/thread/qwaitcondition/qwaitcondition.pro +++ b/tests/auto/corelib/thread/qwaitcondition/qwaitcondition.pro @@ -2,3 +2,4 @@ CONFIG += testcase parallel_test TARGET = tst_qwaitcondition QT = core testlib SOURCES = tst_qwaitcondition.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/thread/qwritelocker/qwritelocker.pro b/tests/auto/corelib/thread/qwritelocker/qwritelocker.pro index 31717fdcb6..4a797975ab 100644 --- a/tests/auto/corelib/thread/qwritelocker/qwritelocker.pro +++ b/tests/auto/corelib/thread/qwritelocker/qwritelocker.pro @@ -2,3 +2,4 @@ CONFIG += testcase parallel_test TARGET = tst_qwritelocker QT = core testlib SOURCES = tst_qwritelocker.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 -- cgit v1.2.3