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/tools/qalgorithms/qalgorithms.pro | 5 +++-- tests/auto/corelib/tools/qbitarray/qbitarray.pro | 5 +++-- tests/auto/corelib/tools/qbytearray/qbytearray.pro | 5 +++-- tests/auto/corelib/tools/qbytearraymatcher/qbytearraymatcher.pro | 5 +++-- tests/auto/corelib/tools/qcache/qcache.pro | 5 +++-- tests/auto/corelib/tools/qchar/qchar.pro | 5 +++-- .../auto/corelib/tools/qcryptographichash/qcryptographichash.pro | 5 +++-- tests/auto/corelib/tools/qdate/qdate.pro | 5 +++-- tests/auto/corelib/tools/qdatetime/qdatetime.pro | 5 +++-- tests/auto/corelib/tools/qeasingcurve/qeasingcurve.pro | 5 +++-- tests/auto/corelib/tools/qelapsedtimer/qelapsedtimer.pro | 5 +++-- .../qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro | 5 +++-- tests/auto/corelib/tools/qfreelist/qfreelist.pro | 5 +++-- tests/auto/corelib/tools/qhash/qhash.pro | 5 +++-- tests/auto/corelib/tools/qline/qline.pro | 5 +++-- tests/auto/corelib/tools/qlist/qlist.pro | 5 +++-- tests/auto/corelib/tools/qlocale/test/test.pro | 4 ++-- tests/auto/corelib/tools/qmap/qmap.pro | 6 +++--- tests/auto/corelib/tools/qmargins/qmargins.pro | 5 +++-- tests/auto/corelib/tools/qpoint/qpoint.pro | 5 +++-- tests/auto/corelib/tools/qqueue/qqueue.pro | 6 +++--- tests/auto/corelib/tools/qrect/qrect.pro | 5 +++-- tests/auto/corelib/tools/qregexp/qregexp.pro | 8 +++----- tests/auto/corelib/tools/qringbuffer/qringbuffer.pro | 5 +++-- tests/auto/corelib/tools/qscopedpointer/qscopedpointer.pro | 5 +++-- .../corelib/tools/qscopedvaluerollback/qscopedvaluerollback.pro | 5 +++-- tests/auto/corelib/tools/qset/qset.pro | 5 +++-- tests/auto/corelib/tools/qsharedpointer/qsharedpointer.pro | 5 +++-- tests/auto/corelib/tools/qsize/qsize.pro | 5 +++-- tests/auto/corelib/tools/qsizef/qsizef.pro | 5 +++-- tests/auto/corelib/tools/qstl/qstl.pro | 5 +++-- tests/auto/corelib/tools/qstring/qstring.pro | 5 +++-- .../tools/qstringbuilder/qstringbuilder1/qstringbuilder1.pro | 5 +++-- .../tools/qstringbuilder/qstringbuilder2/qstringbuilder2.pro | 5 +++-- .../tools/qstringbuilder/qstringbuilder3/qstringbuilder3.pro | 5 +++-- .../tools/qstringbuilder/qstringbuilder4/qstringbuilder4.pro | 5 +++-- tests/auto/corelib/tools/qstringlist/qstringlist.pro | 5 +++-- tests/auto/corelib/tools/qstringmatcher/qstringmatcher.pro | 5 +++-- tests/auto/corelib/tools/qstringref/qstringref.pro | 5 +++-- .../corelib/tools/qtextboundaryfinder/qtextboundaryfinder.pro | 5 +++-- tests/auto/corelib/tools/qtime/qtime.pro | 5 +++-- tests/auto/corelib/tools/qtimeline/qtimeline.pro | 6 +++--- tests/auto/corelib/tools/qvarlengtharray/qvarlengtharray.pro | 6 +++--- tests/auto/corelib/tools/qvector/qvector.pro | 5 +++-- 44 files changed, 131 insertions(+), 95 deletions(-) (limited to 'tests/auto/corelib/tools') diff --git a/tests/auto/corelib/tools/qalgorithms/qalgorithms.pro b/tests/auto/corelib/tools/qalgorithms/qalgorithms.pro index 9143da658d..08271745ee 100644 --- a/tests/auto/corelib/tools/qalgorithms/qalgorithms.pro +++ b/tests/auto/corelib/tools/qalgorithms/qalgorithms.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qalgorithms SOURCES += tst_qalgorithms.cpp -QT = core +QT = core testlib diff --git a/tests/auto/corelib/tools/qbitarray/qbitarray.pro b/tests/auto/corelib/tools/qbitarray/qbitarray.pro index 358d81bad1..528ea58bbd 100644 --- a/tests/auto/corelib/tools/qbitarray/qbitarray.pro +++ b/tests/auto/corelib/tools/qbitarray/qbitarray.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qbitarray SOURCES += tst_qbitarray.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qbytearray/qbytearray.pro b/tests/auto/corelib/tools/qbytearray/qbytearray.pro index d903be2cf6..91a47b235b 100644 --- a/tests/auto/corelib/tools/qbytearray/qbytearray.pro +++ b/tests/auto/corelib/tools/qbytearray/qbytearray.pro @@ -1,8 +1,9 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qbytearray SOURCES += tst_qbytearray.cpp -QT = core core-private +QT = core core-private testlib wince* { addFile.files = rfc3252.txt diff --git a/tests/auto/corelib/tools/qbytearraymatcher/qbytearraymatcher.pro b/tests/auto/corelib/tools/qbytearraymatcher/qbytearraymatcher.pro index a2458e623f..a90511d889 100644 --- a/tests/auto/corelib/tools/qbytearraymatcher/qbytearraymatcher.pro +++ b/tests/auto/corelib/tools/qbytearraymatcher/qbytearraymatcher.pro @@ -1,5 +1,6 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qbytearraymatcher SOURCES += tst_qbytearraymatcher.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qcache/qcache.pro b/tests/auto/corelib/tools/qcache/qcache.pro index 0da4e1414f..bd2a683da2 100644 --- a/tests/auto/corelib/tools/qcache/qcache.pro +++ b/tests/auto/corelib/tools/qcache/qcache.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qcache SOURCES += tst_qcache.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qchar/qchar.pro b/tests/auto/corelib/tools/qchar/qchar.pro index 57b564201d..4921144c01 100644 --- a/tests/auto/corelib/tools/qchar/qchar.pro +++ b/tests/auto/corelib/tools/qchar/qchar.pro @@ -1,7 +1,8 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qchar SOURCES += tst_qchar.cpp -QT = core core-private +QT = core core-private testlib wince*: { deploy.files += NormalizationTest.txt diff --git a/tests/auto/corelib/tools/qcryptographichash/qcryptographichash.pro b/tests/auto/corelib/tools/qcryptographichash/qcryptographichash.pro index 019221206b..4f4d12b2e6 100644 --- a/tests/auto/corelib/tools/qcryptographichash/qcryptographichash.pro +++ b/tests/auto/corelib/tools/qcryptographichash/qcryptographichash.pro @@ -1,5 +1,6 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qcryptographichash SOURCES += tst_qcryptographichash.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qdate/qdate.pro b/tests/auto/corelib/tools/qdate/qdate.pro index 1c041004d3..749c65e1f5 100644 --- a/tests/auto/corelib/tools/qdate/qdate.pro +++ b/tests/auto/corelib/tools/qdate/qdate.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qdate SOURCES += tst_qdate.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qdatetime/qdatetime.pro b/tests/auto/corelib/tools/qdatetime/qdatetime.pro index cd335826ec..33c777fcf7 100644 --- a/tests/auto/corelib/tools/qdatetime/qdatetime.pro +++ b/tests/auto/corelib/tools/qdatetime/qdatetime.pro @@ -1,7 +1,8 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qdatetime SOURCES += tst_qdatetime.cpp -QT = core core-private +QT = core core-private testlib # For some reason using optimization here triggers a compiler issue, which causes an exception # However, the code is correct diff --git a/tests/auto/corelib/tools/qeasingcurve/qeasingcurve.pro b/tests/auto/corelib/tools/qeasingcurve/qeasingcurve.pro index 2a3a075d8a..03d71bb6d9 100644 --- a/tests/auto/corelib/tools/qeasingcurve/qeasingcurve.pro +++ b/tests/auto/corelib/tools/qeasingcurve/qeasingcurve.pro @@ -1,4 +1,5 @@ -load(qttest_p4) -QT = core +CONFIG += testcase +TARGET = tst_qeasingcurve +QT = core testlib SOURCES += tst_qeasingcurve.cpp CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qelapsedtimer/qelapsedtimer.pro b/tests/auto/corelib/tools/qelapsedtimer/qelapsedtimer.pro index 30714f39dc..1efacfe06f 100644 --- a/tests/auto/corelib/tools/qelapsedtimer/qelapsedtimer.pro +++ b/tests/auto/corelib/tools/qelapsedtimer/qelapsedtimer.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT -= gui +CONFIG += testcase +TARGET = tst_qelapsedtimer +QT = core testlib SOURCES += tst_qelapsedtimer.cpp wince* { diff --git a/tests/auto/corelib/tools/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro b/tests/auto/corelib/tools/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro index cf574ffc40..9064d0263a 100644 --- a/tests/auto/corelib/tools/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro +++ b/tests/auto/corelib/tools/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qexplicitlyshareddatapointer SOURCES += tst_qexplicitlyshareddatapointer.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qfreelist/qfreelist.pro b/tests/auto/corelib/tools/qfreelist/qfreelist.pro index 0afa12b8a8..2c3c6932f4 100644 --- a/tests/auto/corelib/tools/qfreelist/qfreelist.pro +++ b/tests/auto/corelib/tools/qfreelist/qfreelist.pro @@ -1,5 +1,6 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qfreelist SOURCES += tst_qfreelist.cpp -QT += core-private +QT += core-private testlib QT -= gui !contains(QT_CONFIG,private_tests): SOURCES += $$QT.core.sources/tools/qfreelist.cpp diff --git a/tests/auto/corelib/tools/qhash/qhash.pro b/tests/auto/corelib/tools/qhash/qhash.pro index 3baa2093b7..171a26edb1 100644 --- a/tests/auto/corelib/tools/qhash/qhash.pro +++ b/tests/auto/corelib/tools/qhash/qhash.pro @@ -1,5 +1,6 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qhash SOURCES += tst_qhash.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qline/qline.pro b/tests/auto/corelib/tools/qline/qline.pro index 9ad7b737f1..9b413e8557 100644 --- a/tests/auto/corelib/tools/qline/qline.pro +++ b/tests/auto/corelib/tools/qline/qline.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT -= gui +CONFIG += testcase +TARGET = tst_qline +QT = core testlib SOURCES += tst_qline.cpp unix:!mac:!vxworks:LIBS+=-lm diff --git a/tests/auto/corelib/tools/qlist/qlist.pro b/tests/auto/corelib/tools/qlist/qlist.pro index 708589e74d..4ab25d0b19 100644 --- a/tests/auto/corelib/tools/qlist/qlist.pro +++ b/tests/auto/corelib/tools/qlist/qlist.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT = core +CONFIG += testcase +TARGET = tst_qlist +QT = core testlib SOURCES += tst_qlist.cpp diff --git a/tests/auto/corelib/tools/qlocale/test/test.pro b/tests/auto/corelib/tools/qlocale/test/test.pro index 8416692230..2cfa593863 100644 --- a/tests/auto/corelib/tools/qlocale/test/test.pro +++ b/tests/auto/corelib/tools/qlocale/test/test.pro @@ -1,4 +1,4 @@ -load(qttest_p4) +CONFIG += testcase SOURCES += ../tst_qlocale.cpp !wince*: { @@ -17,7 +17,7 @@ win32: { -QT = core +QT = core testlib QT += network embedded: QT += gui diff --git a/tests/auto/corelib/tools/qmap/qmap.pro b/tests/auto/corelib/tools/qmap/qmap.pro index eaed926481..fc4c84c58d 100644 --- a/tests/auto/corelib/tools/qmap/qmap.pro +++ b/tests/auto/corelib/tools/qmap/qmap.pro @@ -1,7 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qmap -QT = core +QT = core testlib SOURCES += tst_qmap.cpp -QT = core CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qmargins/qmargins.pro b/tests/auto/corelib/tools/qmargins/qmargins.pro index 0404da0424..02478c3f61 100644 --- a/tests/auto/corelib/tools/qmargins/qmargins.pro +++ b/tests/auto/corelib/tools/qmargins/qmargins.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qmargins SOURCES += tst_qmargins.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qpoint/qpoint.pro b/tests/auto/corelib/tools/qpoint/qpoint.pro index fd240461e2..cd501f648c 100644 --- a/tests/auto/corelib/tools/qpoint/qpoint.pro +++ b/tests/auto/corelib/tools/qpoint/qpoint.pro @@ -2,7 +2,8 @@ # Project file for autotest for file qpoint.h ############################################################ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qpoint SOURCES += tst_qpoint.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qqueue/qqueue.pro b/tests/auto/corelib/tools/qqueue/qqueue.pro index ce0d8c30ca..4a515d719d 100644 --- a/tests/auto/corelib/tools/qqueue/qqueue.pro +++ b/tests/auto/corelib/tools/qqueue/qqueue.pro @@ -1,7 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qqueue -QT = core +QT = core testlib SOURCES += tst_qqueue.cpp -QT = core CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qrect/qrect.pro b/tests/auto/corelib/tools/qrect/qrect.pro index f1ad046e34..149d194e21 100644 --- a/tests/auto/corelib/tools/qrect/qrect.pro +++ b/tests/auto/corelib/tools/qrect/qrect.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qrect SOURCES += tst_qrect.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qregexp/qregexp.pro b/tests/auto/corelib/tools/qregexp/qregexp.pro index e0fef12479..96302354db 100644 --- a/tests/auto/corelib/tools/qregexp/qregexp.pro +++ b/tests/auto/corelib/tools/qregexp/qregexp.pro @@ -1,9 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qregexp -QT = core - - -QT = core +QT = core testlib SOURCES += tst_qregexp.cpp CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qringbuffer/qringbuffer.pro b/tests/auto/corelib/tools/qringbuffer/qringbuffer.pro index dc572d0633..2f595ec8b0 100644 --- a/tests/auto/corelib/tools/qringbuffer/qringbuffer.pro +++ b/tests/auto/corelib/tools/qringbuffer/qringbuffer.pro @@ -1,7 +1,8 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qringbuffer SOURCES += tst_qringbuffer.cpp -QT = core core-private +QT = core core-private testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qscopedpointer/qscopedpointer.pro b/tests/auto/corelib/tools/qscopedpointer/qscopedpointer.pro index 4a3d5b8de8..1aa5e33ad2 100644 --- a/tests/auto/corelib/tools/qscopedpointer/qscopedpointer.pro +++ b/tests/auto/corelib/tools/qscopedpointer/qscopedpointer.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qscopedpointer SOURCES += tst_qscopedpointer.cpp -QT -= gui +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qscopedvaluerollback/qscopedvaluerollback.pro b/tests/auto/corelib/tools/qscopedvaluerollback/qscopedvaluerollback.pro index f06e21ba1f..85aab77e91 100644 --- a/tests/auto/corelib/tools/qscopedvaluerollback/qscopedvaluerollback.pro +++ b/tests/auto/corelib/tools/qscopedvaluerollback/qscopedvaluerollback.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qscopedvaluerollback SOURCES += tst_qscopedvaluerollback.cpp -QT -= gui +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qset/qset.pro b/tests/auto/corelib/tools/qset/qset.pro index 4efc6c7033..0e456c6b3a 100644 --- a/tests/auto/corelib/tools/qset/qset.pro +++ b/tests/auto/corelib/tools/qset/qset.pro @@ -1,5 +1,6 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qset SOURCES += tst_qset.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qsharedpointer/qsharedpointer.pro b/tests/auto/corelib/tools/qsharedpointer/qsharedpointer.pro index 5a941f6232..2e822f6a03 100644 --- a/tests/auto/corelib/tools/qsharedpointer/qsharedpointer.pro +++ b/tests/auto/corelib/tools/qsharedpointer/qsharedpointer.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qsharedpointer SOURCES += tst_qsharedpointer.cpp \ forwarddeclaration.cpp \ @@ -8,7 +9,7 @@ SOURCES += tst_qsharedpointer.cpp \ HEADERS += forwarddeclared.h \ wrapper.h -QT = core +QT = core testlib DEFINES += SRCDIR=\\\"$$PWD/\\\" include(externaltests.pri) diff --git a/tests/auto/corelib/tools/qsize/qsize.pro b/tests/auto/corelib/tools/qsize/qsize.pro index a1814ac8c5..140205bd6b 100644 --- a/tests/auto/corelib/tools/qsize/qsize.pro +++ b/tests/auto/corelib/tools/qsize/qsize.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qsize SOURCES += tst_qsize.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qsizef/qsizef.pro b/tests/auto/corelib/tools/qsizef/qsizef.pro index 5aa07d72a1..e0e9b0d43a 100644 --- a/tests/auto/corelib/tools/qsizef/qsizef.pro +++ b/tests/auto/corelib/tools/qsizef/qsizef.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qsizef SOURCES += tst_qsizef.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qstl/qstl.pro b/tests/auto/corelib/tools/qstl/qstl.pro index a0c9db1dfc..128ee562cc 100644 --- a/tests/auto/corelib/tools/qstl/qstl.pro +++ b/tests/auto/corelib/tools/qstl/qstl.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qstl SOURCES += tst_qstl.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qstring/qstring.pro b/tests/auto/corelib/tools/qstring/qstring.pro index cdf28520fa..4515c32df2 100644 --- a/tests/auto/corelib/tools/qstring/qstring.pro +++ b/tests/auto/corelib/tools/qstring/qstring.pro @@ -1,7 +1,8 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qstring SOURCES += tst_qstring.cpp -QT = core +QT = core testlib DEFINES += QT_NO_CAST_TO_ASCII CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/qstringbuilder1.pro b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/qstringbuilder1.pro index dc9062f4da..1888450699 100644 --- a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/qstringbuilder1.pro +++ b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/qstringbuilder1.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qstringbuilder1 -QT = core +QT = core testlib SOURCES += tst_qstringbuilder1.cpp diff --git a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder2/qstringbuilder2.pro b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder2/qstringbuilder2.pro index a57c6f19f2..8a1554da9e 100644 --- a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder2/qstringbuilder2.pro +++ b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder2/qstringbuilder2.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qstringbuilder2 -QT = core +QT = core testlib SOURCES += tst_qstringbuilder2.cpp CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder3/qstringbuilder3.pro b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder3/qstringbuilder3.pro index 5aced7c258..00e64eee5c 100644 --- a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder3/qstringbuilder3.pro +++ b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder3/qstringbuilder3.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qstringbuilder3 -QT = core +QT = core testlib SOURCES += tst_qstringbuilder3.cpp CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder4/qstringbuilder4.pro b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder4/qstringbuilder4.pro index 0532a9b925..ef7893c977 100644 --- a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder4/qstringbuilder4.pro +++ b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder4/qstringbuilder4.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qstringbuilder4 -QT = core +QT = core testlib SOURCES += tst_qstringbuilder4.cpp CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qstringlist/qstringlist.pro b/tests/auto/corelib/tools/qstringlist/qstringlist.pro index d82a3487fd..73b8559360 100644 --- a/tests/auto/corelib/tools/qstringlist/qstringlist.pro +++ b/tests/auto/corelib/tools/qstringlist/qstringlist.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qstringlist SOURCES += tst_qstringlist.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qstringmatcher/qstringmatcher.pro b/tests/auto/corelib/tools/qstringmatcher/qstringmatcher.pro index c5249ec84a..059916365e 100644 --- a/tests/auto/corelib/tools/qstringmatcher/qstringmatcher.pro +++ b/tests/auto/corelib/tools/qstringmatcher/qstringmatcher.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qstringmatcher SOURCES += tst_qstringmatcher.cpp -QT = core +QT = core testlib DEFINES += QT_NO_CAST_TO_ASCII CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qstringref/qstringref.pro b/tests/auto/corelib/tools/qstringref/qstringref.pro index 34f2de46ae..7aa5f38001 100644 --- a/tests/auto/corelib/tools/qstringref/qstringref.pro +++ b/tests/auto/corelib/tools/qstringref/qstringref.pro @@ -1,5 +1,6 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qstringref SOURCES += tst_qstringref.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qtextboundaryfinder/qtextboundaryfinder.pro b/tests/auto/corelib/tools/qtextboundaryfinder/qtextboundaryfinder.pro index 244f9d2f31..5d50d2c477 100644 --- a/tests/auto/corelib/tools/qtextboundaryfinder/qtextboundaryfinder.pro +++ b/tests/auto/corelib/tools/qtextboundaryfinder/qtextboundaryfinder.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT = core +CONFIG += testcase +TARGET = tst_qtextboundaryfinder +QT = core testlib HEADERS += SOURCES += tst_qtextboundaryfinder.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/corelib/tools/qtime/qtime.pro b/tests/auto/corelib/tools/qtime/qtime.pro index ce4f7ae91f..bc2c58cacd 100644 --- a/tests/auto/corelib/tools/qtime/qtime.pro +++ b/tests/auto/corelib/tools/qtime/qtime.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qtime SOURCES += tst_qtime.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qtimeline/qtimeline.pro b/tests/auto/corelib/tools/qtimeline/qtimeline.pro index 9be717dba8..6dfd22af95 100644 --- a/tests/auto/corelib/tools/qtimeline/qtimeline.pro +++ b/tests/auto/corelib/tools/qtimeline/qtimeline.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -QT = core +CONFIG += testcase +TARGET = tst_qtimeline +QT = core testlib SOURCES += tst_qtimeline.cpp -QT = core CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qvarlengtharray/qvarlengtharray.pro b/tests/auto/corelib/tools/qvarlengtharray/qvarlengtharray.pro index 183da1b938..cb1cb38a57 100644 --- a/tests/auto/corelib/tools/qvarlengtharray/qvarlengtharray.pro +++ b/tests/auto/corelib/tools/qvarlengtharray/qvarlengtharray.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -QT = core +CONFIG += testcase +TARGET = tst_qvarlengtharray +QT = core testlib SOURCES += tst_qvarlengtharray.cpp -QT = core CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qvector/qvector.pro b/tests/auto/corelib/tools/qvector/qvector.pro index a7c3957f2c..12efcc63a8 100644 --- a/tests/auto/corelib/tools/qvector/qvector.pro +++ b/tests/auto/corelib/tools/qvector/qvector.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qvector SOURCES += tst_qvector.cpp -QT = core +QT = core testlib CONFIG += parallel_test -- cgit v1.2.3