From 94fc8750797ffd3ef867d0cdc7849492cfee2c23 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Mon, 7 Nov 2011 16:46:52 +1000 Subject: Cleanup corelib autotests Tidy the autotest .pro files. Most autotest .pro files should look like this: CONFIG += testcase TARGET = tst_something QT = core testlib SOURCES = tst_something.cpp Change-Id: I877c2194e9fa9dd13478d117895e1e255a948ad7 Reviewed-by: Rohan McGovern --- .../auto/corelib/tools/qalgorithms/qalgorithms.pro | 3 +- tests/auto/corelib/tools/qbitarray/qbitarray.pro | 5 ++- tests/auto/corelib/tools/qbytearray/qbytearray.pro | 23 +++++------- .../tools/qbytearraymatcher/qbytearraymatcher.pro | 6 ++-- tests/auto/corelib/tools/qcache/qcache.pro | 5 ++- tests/auto/corelib/tools/qchar/qchar.pro | 11 +++--- .../tools/qcontiguouscache/qcontiguouscache.pro | 8 ++--- .../qcryptographichash/qcryptographichash.pro | 6 ++-- tests/auto/corelib/tools/qdate/qdate.pro | 5 ++- tests/auto/corelib/tools/qdatetime/qdatetime.pro | 10 ++---- .../corelib/tools/qeasingcurve/qeasingcurve.pro | 5 ++- .../corelib/tools/qelapsedtimer/qelapsedtimer.pro | 6 ++-- .../qexplicitlyshareddatapointer.pro | 5 ++- tests/auto/corelib/tools/qfreelist/qfreelist.pro | 5 ++- tests/auto/corelib/tools/qhash/qhash.pro | 6 ++-- tests/auto/corelib/tools/qline/qline.pro | 6 ++-- tests/auto/corelib/tools/qlist/qlist.pro | 5 +-- tests/auto/corelib/tools/qlocale/test/test.pro | 42 +++++++++------------- tests/auto/corelib/tools/qmap/qmap.pro | 7 ++-- tests/auto/corelib/tools/qmargins/qmargins.pro | 5 ++- tests/auto/corelib/tools/qpoint/qpoint.pro | 9 ++--- tests/auto/corelib/tools/qqueue/qqueue.pro | 7 ++-- tests/auto/corelib/tools/qrect/qrect.pro | 5 ++- tests/auto/corelib/tools/qregexp/qregexp.pro | 7 ++-- .../auto/corelib/tools/qringbuffer/qringbuffer.pro | 10 ++---- .../tools/qscopedpointer/qscopedpointer.pro | 5 ++- .../qscopedvaluerollback/qscopedvaluerollback.pro | 5 ++- tests/auto/corelib/tools/qset/qset.pro | 6 ++-- .../tools/qsharedpointer/qsharedpointer.pro | 9 +++-- 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 | 8 ++--- .../qstringbuilder1/qstringbuilder1.pro | 8 ++--- .../qstringbuilder2/qstringbuilder2.pro | 7 ++-- .../qstringbuilder3/qstringbuilder3.pro | 7 ++-- .../qstringbuilder4/qstringbuilder4.pro | 7 ++-- .../auto/corelib/tools/qstringlist/qstringlist.pro | 5 ++- .../tools/qstringmatcher/qstringmatcher.pro | 6 ++-- tests/auto/corelib/tools/qstringref/qstringref.pro | 6 ++-- .../qtextboundaryfinder/qtextboundaryfinder.pro | 6 ++-- tests/auto/corelib/tools/qtime/qtime.pro | 5 ++- tests/auto/corelib/tools/qtimeline/qtimeline.pro | 5 ++- .../tools/qvarlengtharray/qvarlengtharray.pro | 5 ++- tests/auto/corelib/tools/qvector/qvector.pro | 5 ++- 45 files changed, 114 insertions(+), 218 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 08271745ee..0e6e830185 100644 --- a/tests/auto/corelib/tools/qalgorithms/qalgorithms.pro +++ b/tests/auto/corelib/tools/qalgorithms/qalgorithms.pro @@ -1,5 +1,4 @@ CONFIG += testcase TARGET = tst_qalgorithms -SOURCES += tst_qalgorithms.cpp - QT = core testlib +SOURCES = tst_qalgorithms.cpp diff --git a/tests/auto/corelib/tools/qbitarray/qbitarray.pro b/tests/auto/corelib/tools/qbitarray/qbitarray.pro index 528ea58bbd..5574d17f29 100644 --- a/tests/auto/corelib/tools/qbitarray/qbitarray.pro +++ b/tests/auto/corelib/tools/qbitarray/qbitarray.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qbitarray -SOURCES += tst_qbitarray.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qbitarray.cpp diff --git a/tests/auto/corelib/tools/qbytearray/qbytearray.pro b/tests/auto/corelib/tools/qbytearray/qbytearray.pro index 91a47b235b..20aaf86d9e 100644 --- a/tests/auto/corelib/tools/qbytearray/qbytearray.pro +++ b/tests/auto/corelib/tools/qbytearray/qbytearray.pro @@ -1,20 +1,13 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qbytearray -SOURCES += tst_qbytearray.cpp - - -QT = core core-private testlib - -wince* { - addFile.files = rfc3252.txt - addFile.path = . - DEPLOYMENT += addFile -} +QT = core-private testlib +SOURCES = tst_qbytearray.cpp wince* { - DEFINES += SRCDIR=\\\"./\\\" + addFile.files = rfc3252.txt + addFile.path = . + DEPLOYMENT += addFile + DEFINES += SRCDIR=\\\"./\\\" } else { - DEFINES += SRCDIR=\\\"$$PWD/\\\" + DEFINES += SRCDIR=\\\"$$PWD/\\\" } - -CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qbytearraymatcher/qbytearraymatcher.pro b/tests/auto/corelib/tools/qbytearraymatcher/qbytearraymatcher.pro index a90511d889..be3aba53e7 100644 --- a/tests/auto/corelib/tools/qbytearraymatcher/qbytearraymatcher.pro +++ b/tests/auto/corelib/tools/qbytearraymatcher/qbytearraymatcher.pro @@ -1,6 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qbytearraymatcher -SOURCES += tst_qbytearraymatcher.cpp - QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qbytearraymatcher.cpp diff --git a/tests/auto/corelib/tools/qcache/qcache.pro b/tests/auto/corelib/tools/qcache/qcache.pro index bd2a683da2..eff7535979 100644 --- a/tests/auto/corelib/tools/qcache/qcache.pro +++ b/tests/auto/corelib/tools/qcache/qcache.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qcache -SOURCES += tst_qcache.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qcache.cpp diff --git a/tests/auto/corelib/tools/qchar/qchar.pro b/tests/auto/corelib/tools/qchar/qchar.pro index 4921144c01..c0a9f1b1e5 100644 --- a/tests/auto/corelib/tools/qchar/qchar.pro +++ b/tests/auto/corelib/tools/qchar/qchar.pro @@ -1,14 +1,11 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qchar -SOURCES += tst_qchar.cpp +QT = core-private testlib +SOURCES = tst_qchar.cpp -QT = core core-private testlib - -wince*: { +wince* { deploy.files += NormalizationTest.txt DEPLOYMENT += deploy } DEFINES += SRCDIR=\\\"$$PWD/\\\" - -CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qcontiguouscache/qcontiguouscache.pro b/tests/auto/corelib/tools/qcontiguouscache/qcontiguouscache.pro index 911dd1bb42..7cb30f0685 100644 --- a/tests/auto/corelib/tools/qcontiguouscache/qcontiguouscache.pro +++ b/tests/auto/corelib/tools/qcontiguouscache/qcontiguouscache.pro @@ -1,8 +1,4 @@ +CONFIG += testcase parallel_test TARGET = tst_qcontiguouscache -CONFIG += testcase - -SOURCES += tst_qcontiguouscache.cpp - -CONFIG += parallel_test - QT = core testlib +SOURCES = tst_qcontiguouscache.cpp diff --git a/tests/auto/corelib/tools/qcryptographichash/qcryptographichash.pro b/tests/auto/corelib/tools/qcryptographichash/qcryptographichash.pro index 4f4d12b2e6..39987bac35 100644 --- a/tests/auto/corelib/tools/qcryptographichash/qcryptographichash.pro +++ b/tests/auto/corelib/tools/qcryptographichash/qcryptographichash.pro @@ -1,6 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qcryptographichash -SOURCES += tst_qcryptographichash.cpp QT = core testlib - -CONFIG += parallel_test +SOURCES = tst_qcryptographichash.cpp diff --git a/tests/auto/corelib/tools/qdate/qdate.pro b/tests/auto/corelib/tools/qdate/qdate.pro index 749c65e1f5..1073793f05 100644 --- a/tests/auto/corelib/tools/qdate/qdate.pro +++ b/tests/auto/corelib/tools/qdate/qdate.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qdate -SOURCES += tst_qdate.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qdate.cpp diff --git a/tests/auto/corelib/tools/qdatetime/qdatetime.pro b/tests/auto/corelib/tools/qdatetime/qdatetime.pro index 33c777fcf7..0caead836e 100644 --- a/tests/auto/corelib/tools/qdatetime/qdatetime.pro +++ b/tests/auto/corelib/tools/qdatetime/qdatetime.pro @@ -1,8 +1,7 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qdatetime - -SOURCES += tst_qdatetime.cpp -QT = core core-private testlib +QT = core-private testlib +SOURCES = tst_qdatetime.cpp # For some reason using optimization here triggers a compiler issue, which causes an exception # However, the code is correct @@ -11,6 +10,3 @@ win32-msvc|win32-msvc9x { QMAKE_CFLAGS_RELEASE -= -O1 QMAKE_CXXFLAGS_RELEASE -= -O1 } - - -CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qeasingcurve/qeasingcurve.pro b/tests/auto/corelib/tools/qeasingcurve/qeasingcurve.pro index 03d71bb6d9..85c20c5aad 100644 --- a/tests/auto/corelib/tools/qeasingcurve/qeasingcurve.pro +++ b/tests/auto/corelib/tools/qeasingcurve/qeasingcurve.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qeasingcurve QT = core testlib -SOURCES += tst_qeasingcurve.cpp -CONFIG += parallel_test +SOURCES = tst_qeasingcurve.cpp diff --git a/tests/auto/corelib/tools/qelapsedtimer/qelapsedtimer.pro b/tests/auto/corelib/tools/qelapsedtimer/qelapsedtimer.pro index 1efacfe06f..f03343f176 100644 --- a/tests/auto/corelib/tools/qelapsedtimer/qelapsedtimer.pro +++ b/tests/auto/corelib/tools/qelapsedtimer/qelapsedtimer.pro @@ -1,12 +1,10 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qelapsedtimer QT = core testlib +SOURCES = tst_qelapsedtimer.cpp -SOURCES += tst_qelapsedtimer.cpp wince* { DEFINES += SRCDIR=\\\"\\\" } else { DEFINES += SRCDIR=\\\"$$PWD/\\\" } - -CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro b/tests/auto/corelib/tools/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro index 9064d0263a..6fe6c61e20 100644 --- a/tests/auto/corelib/tools/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro +++ b/tests/auto/corelib/tools/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qexplicitlyshareddatapointer -SOURCES += tst_qexplicitlyshareddatapointer.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qexplicitlyshareddatapointer.cpp diff --git a/tests/auto/corelib/tools/qfreelist/qfreelist.pro b/tests/auto/corelib/tools/qfreelist/qfreelist.pro index 2c3c6932f4..d4d26bb5b2 100644 --- a/tests/auto/corelib/tools/qfreelist/qfreelist.pro +++ b/tests/auto/corelib/tools/qfreelist/qfreelist.pro @@ -1,6 +1,5 @@ CONFIG += testcase TARGET = tst_qfreelist -SOURCES += tst_qfreelist.cpp -QT += core-private testlib -QT -= gui +QT = core-private testlib +SOURCES = tst_qfreelist.cpp !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 171a26edb1..3f5d1e84e2 100644 --- a/tests/auto/corelib/tools/qhash/qhash.pro +++ b/tests/auto/corelib/tools/qhash/qhash.pro @@ -1,6 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qhash -SOURCES += tst_qhash.cpp QT = core testlib - -CONFIG += parallel_test +SOURCES = tst_qhash.cpp diff --git a/tests/auto/corelib/tools/qline/qline.pro b/tests/auto/corelib/tools/qline/qline.pro index 9b413e8557..81096e08da 100644 --- a/tests/auto/corelib/tools/qline/qline.pro +++ b/tests/auto/corelib/tools/qline/qline.pro @@ -1,7 +1,5 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qline QT = core testlib -SOURCES += tst_qline.cpp +SOURCES = tst_qline.cpp unix:!mac:!vxworks:LIBS+=-lm - -CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qlist/qlist.pro b/tests/auto/corelib/tools/qlist/qlist.pro index 4ab25d0b19..c4afb5eb1e 100644 --- a/tests/auto/corelib/tools/qlist/qlist.pro +++ b/tests/auto/corelib/tools/qlist/qlist.pro @@ -1,7 +1,4 @@ CONFIG += testcase TARGET = tst_qlist QT = core testlib -SOURCES += tst_qlist.cpp - - - +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 2cfa593863..5c8f8c9097 100644 --- a/tests/auto/corelib/tools/qlocale/test/test.pro +++ b/tests/auto/corelib/tools/qlocale/test/test.pro @@ -1,30 +1,20 @@ CONFIG += testcase -SOURCES += ../tst_qlocale.cpp - -!wince*: { -TARGET = ../tst_qlocale - -win32: { - CONFIG(debug, debug|release) { - TARGET = ../../debug/tst_qlocale -} else { - TARGET = ../../release/tst_qlocale - } -} -} else { - TARGET = tst_qlocale -} - - - -QT = core testlib -QT += network +QT = core testlib network embedded: QT += gui +SOURCES = ../tst_qlocale.cpp -wince*: { - addFiles.files = \ - ../syslocaleapp - - addFiles.path = "\\Program Files\\tst_qlocale" - DEPLOYMENT += addFiles +!wince* { + TARGET = ../tst_qlocale + win32: { + CONFIG(debug, debug|release) { + TARGET = ../../debug/tst_qlocale + } else { + TARGET = ../../release/tst_qlocale + } + } +} else { + TARGET = tst_qlocale + addFiles.files = ../syslocaleapp + addFiles.path = "\\Program Files\\tst_qlocale" + DEPLOYMENT += addFiles } diff --git a/tests/auto/corelib/tools/qmap/qmap.pro b/tests/auto/corelib/tools/qmap/qmap.pro index fc4c84c58d..7a5f0d5e09 100644 --- a/tests/auto/corelib/tools/qmap/qmap.pro +++ b/tests/auto/corelib/tools/qmap/qmap.pro @@ -1,7 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qmap - QT = core testlib - -SOURCES += tst_qmap.cpp -CONFIG += parallel_test +SOURCES = tst_qmap.cpp diff --git a/tests/auto/corelib/tools/qmargins/qmargins.pro b/tests/auto/corelib/tools/qmargins/qmargins.pro index 02478c3f61..b819d89393 100644 --- a/tests/auto/corelib/tools/qmargins/qmargins.pro +++ b/tests/auto/corelib/tools/qmargins/qmargins.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qmargins -SOURCES += tst_qmargins.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qmargins.cpp diff --git a/tests/auto/corelib/tools/qpoint/qpoint.pro b/tests/auto/corelib/tools/qpoint/qpoint.pro index cd501f648c..4c00f00685 100644 --- a/tests/auto/corelib/tools/qpoint/qpoint.pro +++ b/tests/auto/corelib/tools/qpoint/qpoint.pro @@ -1,9 +1,4 @@ -############################################################ -# Project file for autotest for file qpoint.h -############################################################ - -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qpoint -SOURCES += tst_qpoint.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qpoint.cpp diff --git a/tests/auto/corelib/tools/qqueue/qqueue.pro b/tests/auto/corelib/tools/qqueue/qqueue.pro index 4a515d719d..bf32e6c662 100644 --- a/tests/auto/corelib/tools/qqueue/qqueue.pro +++ b/tests/auto/corelib/tools/qqueue/qqueue.pro @@ -1,7 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qqueue - QT = core testlib - -SOURCES += tst_qqueue.cpp -CONFIG += parallel_test +SOURCES = tst_qqueue.cpp diff --git a/tests/auto/corelib/tools/qrect/qrect.pro b/tests/auto/corelib/tools/qrect/qrect.pro index 149d194e21..df606476c0 100644 --- a/tests/auto/corelib/tools/qrect/qrect.pro +++ b/tests/auto/corelib/tools/qrect/qrect.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qrect -SOURCES += tst_qrect.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qrect.cpp diff --git a/tests/auto/corelib/tools/qregexp/qregexp.pro b/tests/auto/corelib/tools/qregexp/qregexp.pro index 96302354db..6fef2d6f25 100644 --- a/tests/auto/corelib/tools/qregexp/qregexp.pro +++ b/tests/auto/corelib/tools/qregexp/qregexp.pro @@ -1,7 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qregexp - QT = core testlib - -SOURCES += tst_qregexp.cpp -CONFIG += parallel_test +SOURCES = tst_qregexp.cpp diff --git a/tests/auto/corelib/tools/qringbuffer/qringbuffer.pro b/tests/auto/corelib/tools/qringbuffer/qringbuffer.pro index 2f595ec8b0..314ba2aa26 100644 --- a/tests/auto/corelib/tools/qringbuffer/qringbuffer.pro +++ b/tests/auto/corelib/tools/qringbuffer/qringbuffer.pro @@ -1,8 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qringbuffer -SOURCES += tst_qringbuffer.cpp - -QT = core core-private testlib - - -CONFIG += parallel_test +QT = core-private testlib +SOURCES = tst_qringbuffer.cpp diff --git a/tests/auto/corelib/tools/qscopedpointer/qscopedpointer.pro b/tests/auto/corelib/tools/qscopedpointer/qscopedpointer.pro index 1aa5e33ad2..4ae75d4c75 100644 --- a/tests/auto/corelib/tools/qscopedpointer/qscopedpointer.pro +++ b/tests/auto/corelib/tools/qscopedpointer/qscopedpointer.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qscopedpointer -SOURCES += tst_qscopedpointer.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qscopedpointer.cpp diff --git a/tests/auto/corelib/tools/qscopedvaluerollback/qscopedvaluerollback.pro b/tests/auto/corelib/tools/qscopedvaluerollback/qscopedvaluerollback.pro index 85aab77e91..7a5d8fe641 100644 --- a/tests/auto/corelib/tools/qscopedvaluerollback/qscopedvaluerollback.pro +++ b/tests/auto/corelib/tools/qscopedvaluerollback/qscopedvaluerollback.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qscopedvaluerollback -SOURCES += tst_qscopedvaluerollback.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qscopedvaluerollback.cpp diff --git a/tests/auto/corelib/tools/qset/qset.pro b/tests/auto/corelib/tools/qset/qset.pro index 0e456c6b3a..3bca59bd75 100644 --- a/tests/auto/corelib/tools/qset/qset.pro +++ b/tests/auto/corelib/tools/qset/qset.pro @@ -1,6 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qset -SOURCES += tst_qset.cpp QT = core testlib - -CONFIG += parallel_test +SOURCES = tst_qset.cpp diff --git a/tests/auto/corelib/tools/qsharedpointer/qsharedpointer.pro b/tests/auto/corelib/tools/qsharedpointer/qsharedpointer.pro index 2e822f6a03..8ee58a03f0 100644 --- a/tests/auto/corelib/tools/qsharedpointer/qsharedpointer.pro +++ b/tests/auto/corelib/tools/qsharedpointer/qsharedpointer.pro @@ -1,16 +1,15 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qsharedpointer +QT = core testlib -SOURCES += tst_qsharedpointer.cpp \ +SOURCES = tst_qsharedpointer.cpp \ forwarddeclaration.cpp \ forwarddeclared.cpp \ wrapper.cpp -HEADERS += forwarddeclared.h \ +HEADERS = forwarddeclared.h \ wrapper.h -QT = core testlib DEFINES += SRCDIR=\\\"$$PWD/\\\" include(externaltests.pri) -CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qsize/qsize.pro b/tests/auto/corelib/tools/qsize/qsize.pro index 140205bd6b..8b5ad9d661 100644 --- a/tests/auto/corelib/tools/qsize/qsize.pro +++ b/tests/auto/corelib/tools/qsize/qsize.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qsize -SOURCES += tst_qsize.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qsize.cpp diff --git a/tests/auto/corelib/tools/qsizef/qsizef.pro b/tests/auto/corelib/tools/qsizef/qsizef.pro index e0e9b0d43a..0807384e0a 100644 --- a/tests/auto/corelib/tools/qsizef/qsizef.pro +++ b/tests/auto/corelib/tools/qsizef/qsizef.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qsizef -SOURCES += tst_qsizef.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qsizef.cpp diff --git a/tests/auto/corelib/tools/qstl/qstl.pro b/tests/auto/corelib/tools/qstl/qstl.pro index 128ee562cc..1c03ac8ace 100644 --- a/tests/auto/corelib/tools/qstl/qstl.pro +++ b/tests/auto/corelib/tools/qstl/qstl.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qstl -SOURCES += tst_qstl.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qstl.cpp diff --git a/tests/auto/corelib/tools/qstring/qstring.pro b/tests/auto/corelib/tools/qstring/qstring.pro index 4515c32df2..5694db83d2 100644 --- a/tests/auto/corelib/tools/qstring/qstring.pro +++ b/tests/auto/corelib/tools/qstring/qstring.pro @@ -1,10 +1,6 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qstring -SOURCES += tst_qstring.cpp - QT = core testlib - +SOURCES = tst_qstring.cpp DEFINES += QT_NO_CAST_TO_ASCII -CONFIG += parallel_test - contains(QT_CONFIG,icu):DEFINES += QT_USE_ICU diff --git a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/qstringbuilder1.pro b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/qstringbuilder1.pro index 1888450699..a69279d973 100644 --- a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/qstringbuilder1.pro +++ b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/qstringbuilder1.pro @@ -1,8 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qstringbuilder1 - QT = core testlib - -SOURCES += tst_qstringbuilder1.cpp - -CONFIG += parallel_test +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 8a1554da9e..86bb20e28e 100644 --- a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder2/qstringbuilder2.pro +++ b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder2/qstringbuilder2.pro @@ -1,7 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qstringbuilder2 - QT = core testlib - -SOURCES += tst_qstringbuilder2.cpp -CONFIG += parallel_test +SOURCES = tst_qstringbuilder2.cpp diff --git a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder3/qstringbuilder3.pro b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder3/qstringbuilder3.pro index 00e64eee5c..7360cd64ca 100644 --- a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder3/qstringbuilder3.pro +++ b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder3/qstringbuilder3.pro @@ -1,7 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qstringbuilder3 - QT = core testlib - -SOURCES += tst_qstringbuilder3.cpp -CONFIG += parallel_test +SOURCES = tst_qstringbuilder3.cpp diff --git a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder4/qstringbuilder4.pro b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder4/qstringbuilder4.pro index ef7893c977..c26cc25cfe 100644 --- a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder4/qstringbuilder4.pro +++ b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder4/qstringbuilder4.pro @@ -1,7 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qstringbuilder4 - QT = core testlib - -SOURCES += tst_qstringbuilder4.cpp -CONFIG += parallel_test +SOURCES = tst_qstringbuilder4.cpp diff --git a/tests/auto/corelib/tools/qstringlist/qstringlist.pro b/tests/auto/corelib/tools/qstringlist/qstringlist.pro index 73b8559360..0dea1c0a8f 100644 --- a/tests/auto/corelib/tools/qstringlist/qstringlist.pro +++ b/tests/auto/corelib/tools/qstringlist/qstringlist.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qstringlist -SOURCES += tst_qstringlist.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qstringlist.cpp diff --git a/tests/auto/corelib/tools/qstringmatcher/qstringmatcher.pro b/tests/auto/corelib/tools/qstringmatcher/qstringmatcher.pro index 059916365e..dbbefb0916 100644 --- a/tests/auto/corelib/tools/qstringmatcher/qstringmatcher.pro +++ b/tests/auto/corelib/tools/qstringmatcher/qstringmatcher.pro @@ -1,7 +1,5 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qstringmatcher -SOURCES += tst_qstringmatcher.cpp QT = core testlib +SOURCES = tst_qstringmatcher.cpp 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 7aa5f38001..16eaa6731b 100644 --- a/tests/auto/corelib/tools/qstringref/qstringref.pro +++ b/tests/auto/corelib/tools/qstringref/qstringref.pro @@ -1,6 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qstringref -SOURCES += tst_qstringref.cpp - QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qstringref.cpp diff --git a/tests/auto/corelib/tools/qtextboundaryfinder/qtextboundaryfinder.pro b/tests/auto/corelib/tools/qtextboundaryfinder/qtextboundaryfinder.pro index 5d50d2c477..68f189b130 100644 --- a/tests/auto/corelib/tools/qtextboundaryfinder/qtextboundaryfinder.pro +++ b/tests/auto/corelib/tools/qtextboundaryfinder/qtextboundaryfinder.pro @@ -1,8 +1,7 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qtextboundaryfinder QT = core testlib -HEADERS += -SOURCES += tst_qtextboundaryfinder.cpp +SOURCES = tst_qtextboundaryfinder.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" wince* { @@ -10,4 +9,3 @@ wince* { addFiles.path = . DEPLOYMENT += addFiles } -CONFIG += parallel_test diff --git a/tests/auto/corelib/tools/qtime/qtime.pro b/tests/auto/corelib/tools/qtime/qtime.pro index bc2c58cacd..7bb0858fed 100644 --- a/tests/auto/corelib/tools/qtime/qtime.pro +++ b/tests/auto/corelib/tools/qtime/qtime.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qtime -SOURCES += tst_qtime.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qtime.cpp diff --git a/tests/auto/corelib/tools/qtimeline/qtimeline.pro b/tests/auto/corelib/tools/qtimeline/qtimeline.pro index 6dfd22af95..3a6c120b5a 100644 --- a/tests/auto/corelib/tools/qtimeline/qtimeline.pro +++ b/tests/auto/corelib/tools/qtimeline/qtimeline.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qtimeline QT = core testlib -SOURCES += tst_qtimeline.cpp -CONFIG += parallel_test +SOURCES = tst_qtimeline.cpp diff --git a/tests/auto/corelib/tools/qvarlengtharray/qvarlengtharray.pro b/tests/auto/corelib/tools/qvarlengtharray/qvarlengtharray.pro index cb1cb38a57..5a467fc1dc 100644 --- a/tests/auto/corelib/tools/qvarlengtharray/qvarlengtharray.pro +++ b/tests/auto/corelib/tools/qvarlengtharray/qvarlengtharray.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qvarlengtharray QT = core testlib -SOURCES += tst_qvarlengtharray.cpp -CONFIG += parallel_test +SOURCES = tst_qvarlengtharray.cpp diff --git a/tests/auto/corelib/tools/qvector/qvector.pro b/tests/auto/corelib/tools/qvector/qvector.pro index 12efcc63a8..e33cd491bb 100644 --- a/tests/auto/corelib/tools/qvector/qvector.pro +++ b/tests/auto/corelib/tools/qvector/qvector.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qvector -SOURCES += tst_qvector.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qvector.cpp -- cgit v1.2.3