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/concurrent/qfuture/qfuture.pro | 5 +++-- .../corelib/concurrent/qfuturesynchronizer/qfuturesynchronizer.pro | 5 +++-- tests/auto/corelib/concurrent/qfuturewatcher/qfuturewatcher.pro | 5 +++-- .../corelib/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro | 5 +++-- .../qtconcurrentiteratekernel/qtconcurrentiteratekernel.pro | 5 +++-- tests/auto/corelib/concurrent/qtconcurrentmap/qtconcurrentmap.pro | 5 +++-- .../concurrent/qtconcurrentresultstore/qtconcurrentresultstore.pro | 5 +++-- tests/auto/corelib/concurrent/qtconcurrentrun/qtconcurrentrun.pro | 5 +++-- .../concurrent/qtconcurrentthreadengine/qtconcurrentthreadengine.pro | 5 +++-- tests/auto/corelib/concurrent/qthreadpool/qthreadpool.pro | 5 +++-- 10 files changed, 30 insertions(+), 20 deletions(-) (limited to 'tests/auto/corelib/concurrent') diff --git a/tests/auto/corelib/concurrent/qfuture/qfuture.pro b/tests/auto/corelib/concurrent/qfuture/qfuture.pro index 0e74f47678..606c15a5a6 100644 --- a/tests/auto/corelib/concurrent/qfuture/qfuture.pro +++ b/tests/auto/corelib/concurrent/qfuture/qfuture.pro @@ -1,5 +1,6 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qfuture DEFINES += QT_STRICT_ITERATORS SOURCES += tst_qfuture.cpp -QT = core core-private +QT = core core-private testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/concurrent/qfuturesynchronizer/qfuturesynchronizer.pro b/tests/auto/corelib/concurrent/qfuturesynchronizer/qfuturesynchronizer.pro index 11012cce24..18cc00d7a3 100644 --- a/tests/auto/corelib/concurrent/qfuturesynchronizer/qfuturesynchronizer.pro +++ b/tests/auto/corelib/concurrent/qfuturesynchronizer/qfuturesynchronizer.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT = core +CONFIG += testcase +TARGET = tst_qfuturesynchronizer +QT = core testlib SOURCES += tst_qfuturesynchronizer.cpp \ CONFIG += parallel_test diff --git a/tests/auto/corelib/concurrent/qfuturewatcher/qfuturewatcher.pro b/tests/auto/corelib/concurrent/qfuturewatcher/qfuturewatcher.pro index 9de37d014f..a69232156c 100644 --- a/tests/auto/corelib/concurrent/qfuturewatcher/qfuturewatcher.pro +++ b/tests/auto/corelib/concurrent/qfuturewatcher/qfuturewatcher.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qfuturewatcher SOURCES += tst_qfuturewatcher.cpp -QT = core core-private +QT = core core-private testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro b/tests/auto/corelib/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro index c5cfb2a093..f325514015 100644 --- a/tests/auto/corelib/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro +++ b/tests/auto/corelib/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qtconcurrentfilter DEFINES += QT_STRICT_ITERATORS SOURCES += tst_qtconcurrentfilter.cpp -QT = core +QT = core testlib CONFIG += parallel_test CONFIG += insignificant_test # See QTBUG-20688 diff --git a/tests/auto/corelib/concurrent/qtconcurrentiteratekernel/qtconcurrentiteratekernel.pro b/tests/auto/corelib/concurrent/qtconcurrentiteratekernel/qtconcurrentiteratekernel.pro index c8cfe4c115..cf48c1e382 100644 --- a/tests/auto/corelib/concurrent/qtconcurrentiteratekernel/qtconcurrentiteratekernel.pro +++ b/tests/auto/corelib/concurrent/qtconcurrentiteratekernel/qtconcurrentiteratekernel.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qtconcurrentiteratekernel SOURCES += tst_qtconcurrentiteratekernel.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/concurrent/qtconcurrentmap/qtconcurrentmap.pro b/tests/auto/corelib/concurrent/qtconcurrentmap/qtconcurrentmap.pro index 4edfc64cb3..72bf95ec9e 100644 --- a/tests/auto/corelib/concurrent/qtconcurrentmap/qtconcurrentmap.pro +++ b/tests/auto/corelib/concurrent/qtconcurrentmap/qtconcurrentmap.pro @@ -1,5 +1,6 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qtconcurrentmap DEFINES += QT_STRICT_ITERATORS SOURCES += tst_qtconcurrentmap.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/concurrent/qtconcurrentresultstore/qtconcurrentresultstore.pro b/tests/auto/corelib/concurrent/qtconcurrentresultstore/qtconcurrentresultstore.pro index 8bc20c3f13..037bb89089 100644 --- a/tests/auto/corelib/concurrent/qtconcurrentresultstore/qtconcurrentresultstore.pro +++ b/tests/auto/corelib/concurrent/qtconcurrentresultstore/qtconcurrentresultstore.pro @@ -1,5 +1,6 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qtconcurrentresultstore DEFINES += QT_STRICT_ITERATORS SOURCES += tst_qtconcurrentresultstore.cpp -QT = core core-private +QT = core core-private testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/concurrent/qtconcurrentrun/qtconcurrentrun.pro b/tests/auto/corelib/concurrent/qtconcurrentrun/qtconcurrentrun.pro index dfccf06de9..19148677ec 100644 --- a/tests/auto/corelib/concurrent/qtconcurrentrun/qtconcurrentrun.pro +++ b/tests/auto/corelib/concurrent/qtconcurrentrun/qtconcurrentrun.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qtconcurrentrun SOURCES += tst_qtconcurrentrun.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/concurrent/qtconcurrentthreadengine/qtconcurrentthreadengine.pro b/tests/auto/corelib/concurrent/qtconcurrentthreadengine/qtconcurrentthreadengine.pro index d7e2464089..f734fc5282 100644 --- a/tests/auto/corelib/concurrent/qtconcurrentthreadengine/qtconcurrentthreadengine.pro +++ b/tests/auto/corelib/concurrent/qtconcurrentthreadengine/qtconcurrentthreadengine.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qtconcurrentthreadengine SOURCES += tst_qtconcurrentthreadengine.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/concurrent/qthreadpool/qthreadpool.pro b/tests/auto/corelib/concurrent/qthreadpool/qthreadpool.pro index dbaeb208dd..df13d5f82f 100644 --- a/tests/auto/corelib/concurrent/qthreadpool/qthreadpool.pro +++ b/tests/auto/corelib/concurrent/qthreadpool/qthreadpool.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qthreadpool SOURCES += tst_qthreadpool.cpp -QT = core +QT = core testlib CONFIG += parallel_test -- cgit v1.2.3