From 07102cebded5b54acdb8d20f3e49be0aa0c2c1e2 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Tue, 25 Oct 2011 11:26:19 +1000 Subject: corelib: eliminated usage of qttest_p4.prf qttest_p4.prf was added as a convenience for Qt's own autotests in Qt4. It enables various crufty undocumented magic, of dubious value. Stop using it, and explicitly enable the things from it which we want. Change-Id: I7c1ffe9c8c294dbdc988e1582e580b1ed3f4593e Reviewed-by: Jason McDonald --- tests/auto/corelib/thread/qatomicint/qatomicint.pro | 5 +++-- tests/auto/corelib/thread/qatomicpointer/qatomicpointer.pro | 5 +++-- tests/auto/corelib/thread/qmutex/qmutex.pro | 5 +++-- tests/auto/corelib/thread/qmutexlocker/qmutexlocker.pro | 5 +++-- tests/auto/corelib/thread/qreadlocker/qreadlocker.pro | 5 +++-- tests/auto/corelib/thread/qreadwritelock/qreadwritelock.pro | 5 +++-- tests/auto/corelib/thread/qsemaphore/qsemaphore.pro | 5 +++-- tests/auto/corelib/thread/qthread/qthread.pro | 5 +++-- tests/auto/corelib/thread/qthreadonce/qthreadonce.pro | 5 +++-- tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.pro | 5 +++-- tests/auto/corelib/thread/qwaitcondition/qwaitcondition.pro | 5 +++-- tests/auto/corelib/thread/qwritelocker/qwritelocker.pro | 5 +++-- 12 files changed, 36 insertions(+), 24 deletions(-) (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 7850d93dc7..dd18c7d6db 100644 --- a/tests/auto/corelib/thread/qatomicint/qatomicint.pro +++ b/tests/auto/corelib/thread/qatomicint/qatomicint.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qatomicint SOURCES += tst_qatomicint.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/thread/qatomicpointer/qatomicpointer.pro b/tests/auto/corelib/thread/qatomicpointer/qatomicpointer.pro index 89ff137d39..dc6c54a2da 100644 --- a/tests/auto/corelib/thread/qatomicpointer/qatomicpointer.pro +++ b/tests/auto/corelib/thread/qatomicpointer/qatomicpointer.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qatomicpointer SOURCES += tst_qatomicpointer.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/thread/qmutex/qmutex.pro b/tests/auto/corelib/thread/qmutex/qmutex.pro index 760dcfd2d8..cf567c2f65 100644 --- a/tests/auto/corelib/thread/qmutex/qmutex.pro +++ b/tests/auto/corelib/thread/qmutex/qmutex.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qmutex SOURCES += tst_qmutex.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/thread/qmutexlocker/qmutexlocker.pro b/tests/auto/corelib/thread/qmutexlocker/qmutexlocker.pro index 01c369101b..9e44b5f84c 100644 --- a/tests/auto/corelib/thread/qmutexlocker/qmutexlocker.pro +++ b/tests/auto/corelib/thread/qmutexlocker/qmutexlocker.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qmutexlocker SOURCES += tst_qmutexlocker.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/thread/qreadlocker/qreadlocker.pro b/tests/auto/corelib/thread/qreadlocker/qreadlocker.pro index ee533070a7..13cdf0c58b 100644 --- a/tests/auto/corelib/thread/qreadlocker/qreadlocker.pro +++ b/tests/auto/corelib/thread/qreadlocker/qreadlocker.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qreadlocker SOURCES += tst_qreadlocker.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/thread/qreadwritelock/qreadwritelock.pro b/tests/auto/corelib/thread/qreadwritelock/qreadwritelock.pro index 93f7c68dc3..c35023d46e 100644 --- a/tests/auto/corelib/thread/qreadwritelock/qreadwritelock.pro +++ b/tests/auto/corelib/thread/qreadwritelock/qreadwritelock.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qreadwritelock SOURCES += tst_qreadwritelock.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/thread/qsemaphore/qsemaphore.pro b/tests/auto/corelib/thread/qsemaphore/qsemaphore.pro index a75bf443bc..871bd97105 100644 --- a/tests/auto/corelib/thread/qsemaphore/qsemaphore.pro +++ b/tests/auto/corelib/thread/qsemaphore/qsemaphore.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qsemaphore SOURCES += tst_qsemaphore.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/thread/qthread/qthread.pro b/tests/auto/corelib/thread/qthread/qthread.pro index ae11d719c0..da3be3bf76 100644 --- a/tests/auto/corelib/thread/qthread/qthread.pro +++ b/tests/auto/corelib/thread/qthread/qthread.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qthread SOURCES += tst_qthread.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/thread/qthreadonce/qthreadonce.pro b/tests/auto/corelib/thread/qthreadonce/qthreadonce.pro index d7ef4d4c23..cd97917165 100644 --- a/tests/auto/corelib/thread/qthreadonce/qthreadonce.pro +++ b/tests/auto/corelib/thread/qthreadonce/qthreadonce.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qthreadonce SOURCES += tst_qthreadonce.cpp -QT = core +QT = core testlib # Don't use gcc's threadsafe statics # Note: some versions of gcc generate invalid code with this option... diff --git a/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.pro b/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.pro index ae03169bcb..64f176748d 100644 --- a/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.pro +++ b/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.pro @@ -1,3 +1,4 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qthreadstorage SOURCES += tst_qthreadstorage.cpp -QT = core +QT = core testlib diff --git a/tests/auto/corelib/thread/qwaitcondition/qwaitcondition.pro b/tests/auto/corelib/thread/qwaitcondition/qwaitcondition.pro index 9af0c71301..b9cf3af5b3 100644 --- a/tests/auto/corelib/thread/qwaitcondition/qwaitcondition.pro +++ b/tests/auto/corelib/thread/qwaitcondition/qwaitcondition.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qwaitcondition SOURCES += tst_qwaitcondition.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/thread/qwritelocker/qwritelocker.pro b/tests/auto/corelib/thread/qwritelocker/qwritelocker.pro index 39a98aaba5..946e75ca06 100644 --- a/tests/auto/corelib/thread/qwritelocker/qwritelocker.pro +++ b/tests/auto/corelib/thread/qwritelocker/qwritelocker.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qwritelocker SOURCES += tst_qwritelocker.cpp -QT = core +QT = core testlib CONFIG += parallel_test -- cgit v1.2.3