diff options
Diffstat (limited to 'tests/auto/corelib')
126 files changed, 435 insertions, 709 deletions
diff --git a/tests/auto/corelib/animation/qabstractanimation/qabstractanimation.pro b/tests/auto/corelib/animation/qabstractanimation/qabstractanimation.pro index a948003ca9..970f7e328b 100644 --- a/tests/auto/corelib/animation/qabstractanimation/qabstractanimation.pro +++ b/tests/auto/corelib/animation/qabstractanimation/qabstractanimation.pro @@ -1,7 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qabstractanimation QT = core testlib -SOURCES += tst_qabstractanimation.cpp \ - - -CONFIG += parallel_test +SOURCES = tst_qabstractanimation.cpp diff --git a/tests/auto/corelib/animation/qanimationgroup/qanimationgroup.pro b/tests/auto/corelib/animation/qanimationgroup/qanimationgroup.pro index 179412a387..e06ed507d5 100644 --- a/tests/auto/corelib/animation/qanimationgroup/qanimationgroup.pro +++ b/tests/auto/corelib/animation/qanimationgroup/qanimationgroup.pro @@ -1,7 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qanimationgroup QT = core testlib -SOURCES += tst_qanimationgroup.cpp - - -CONFIG += parallel_test +SOURCES = tst_qanimationgroup.cpp diff --git a/tests/auto/corelib/animation/qparallelanimationgroup/qparallelanimationgroup.pro b/tests/auto/corelib/animation/qparallelanimationgroup/qparallelanimationgroup.pro index e18d17b4f8..9303c89bf8 100644 --- a/tests/auto/corelib/animation/qparallelanimationgroup/qparallelanimationgroup.pro +++ b/tests/auto/corelib/animation/qparallelanimationgroup/qparallelanimationgroup.pro @@ -1,6 +1,4 @@ CONFIG += testcase TARGET = tst_qparallelanimationgroup QT = core gui testlib -SOURCES += tst_qparallelanimationgroup.cpp - - +SOURCES = tst_qparallelanimationgroup.cpp diff --git a/tests/auto/corelib/animation/qpauseanimation/qpauseanimation.pro b/tests/auto/corelib/animation/qpauseanimation/qpauseanimation.pro index e254c67b7a..74fb2ee979 100644 --- a/tests/auto/corelib/animation/qpauseanimation/qpauseanimation.pro +++ b/tests/auto/corelib/animation/qpauseanimation/qpauseanimation.pro @@ -1,6 +1,4 @@ CONFIG += testcase TARGET = tst_qpauseanimation -QT = core core-private gui gui-private testlib -SOURCES += tst_qpauseanimation.cpp - - +QT = core-private gui-private testlib +SOURCES = tst_qpauseanimation.cpp diff --git a/tests/auto/corelib/animation/qpropertyanimation/qpropertyanimation.pro b/tests/auto/corelib/animation/qpropertyanimation/qpropertyanimation.pro index 2286688471..bfeb183abf 100644 --- a/tests/auto/corelib/animation/qpropertyanimation/qpropertyanimation.pro +++ b/tests/auto/corelib/animation/qpropertyanimation/qpropertyanimation.pro @@ -1,6 +1,4 @@ CONFIG += testcase TARGET = tst_qpropertyanimation QT = core gui widgets testlib -SOURCES += tst_qpropertyanimation.cpp - - +SOURCES = tst_qpropertyanimation.cpp diff --git a/tests/auto/corelib/animation/qsequentialanimationgroup/qsequentialanimationgroup.pro b/tests/auto/corelib/animation/qsequentialanimationgroup/qsequentialanimationgroup.pro index 810e0a7bb8..9cdd9301f8 100644 --- a/tests/auto/corelib/animation/qsequentialanimationgroup/qsequentialanimationgroup.pro +++ b/tests/auto/corelib/animation/qsequentialanimationgroup/qsequentialanimationgroup.pro @@ -1,7 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qsequentialanimationgroup QT = core testlib -SOURCES += tst_qsequentialanimationgroup.cpp - - -CONFIG += parallel_test +SOURCES = tst_qsequentialanimationgroup.cpp diff --git a/tests/auto/corelib/animation/qvariantanimation/qvariantanimation.pro b/tests/auto/corelib/animation/qvariantanimation/qvariantanimation.pro index 2b16d6949c..f9e96780af 100644 --- a/tests/auto/corelib/animation/qvariantanimation/qvariantanimation.pro +++ b/tests/auto/corelib/animation/qvariantanimation/qvariantanimation.pro @@ -1,7 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qvariantanimation QT = core testlib -SOURCES += tst_qvariantanimation.cpp \ - - -CONFIG += parallel_test +SOURCES = tst_qvariantanimation.cpp diff --git a/tests/auto/corelib/codecs/qtextcodec/test/test.pro b/tests/auto/corelib/codecs/qtextcodec/test/test.pro index 6178fcf665..16b831ec03 100644 --- a/tests/auto/corelib/codecs/qtextcodec/test/test.pro +++ b/tests/auto/corelib/codecs/qtextcodec/test/test.pro @@ -1,33 +1,24 @@ CONFIG += testcase QT += testlib +SOURCES = ../tst_qtextcodec.cpp -SOURCES += ../tst_qtextcodec.cpp - -!wince*: { -TARGET = ../tst_qtextcodec - -win32: { - CONFIG(debug, debug|release) { - TARGET = ../../debug/tst_qtextcodec -} else { - TARGET = ../../release/tst_qtextcodec - } -} -} else { - TARGET = tst_qtextcodec -} - -wince* { - addFiles.files = ../*.txt - addFiles.path = . - DEPLOYMENT += addFiles - wince*|qt_not_deployed { - DEPLOYMENT_PLUGIN += qcncodecs qjpcodecs qkrcodecs qtwcodecs - } -} - -wince*: { - DEFINES += SRCDIR=\\\"\\\" +!wince* { + TARGET = ../tst_qtextcodec + win32: { + CONFIG(debug, debug|release) { + TARGET = ../../debug/tst_qtextcodec + } else { + TARGET = ../../release/tst_qtextcodec + } + } + DEFINES += SRCDIR=\\\"$$PWD/../\\\" } else { - DEFINES += SRCDIR=\\\"$$PWD/../\\\" + TARGET = tst_qtextcodec + addFiles.files = ../*.txt + addFiles.path = . + DEPLOYMENT += addFiles + qt_not_deployed { + DEPLOYMENT_PLUGIN += qcncodecs qjpcodecs qkrcodecs qtwcodecs + } + DEFINES += SRCDIR=\\\"\\\" } diff --git a/tests/auto/corelib/concurrent/qfuture/qfuture.pro b/tests/auto/corelib/concurrent/qfuture/qfuture.pro index 606c15a5a6..517871ab5d 100644 --- a/tests/auto/corelib/concurrent/qfuture/qfuture.pro +++ b/tests/auto/corelib/concurrent/qfuture/qfuture.pro @@ -1,6 +1,5 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qfuture +QT = core-private testlib +SOURCES = tst_qfuture.cpp DEFINES += QT_STRICT_ITERATORS -SOURCES += tst_qfuture.cpp -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 18cc00d7a3..b36560b4ba 100644 --- a/tests/auto/corelib/concurrent/qfuturesynchronizer/qfuturesynchronizer.pro +++ b/tests/auto/corelib/concurrent/qfuturesynchronizer/qfuturesynchronizer.pro @@ -1,6 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qfuturesynchronizer QT = core testlib -SOURCES += tst_qfuturesynchronizer.cpp \ - -CONFIG += parallel_test +SOURCES = tst_qfuturesynchronizer.cpp diff --git a/tests/auto/corelib/concurrent/qfuturewatcher/qfuturewatcher.pro b/tests/auto/corelib/concurrent/qfuturewatcher/qfuturewatcher.pro index a69232156c..ae98fed3d9 100644 --- a/tests/auto/corelib/concurrent/qfuturewatcher/qfuturewatcher.pro +++ b/tests/auto/corelib/concurrent/qfuturewatcher/qfuturewatcher.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qfuturewatcher -SOURCES += tst_qfuturewatcher.cpp -QT = core core-private testlib -CONFIG += parallel_test +QT = core-private testlib +SOURCES = tst_qfuturewatcher.cpp diff --git a/tests/auto/corelib/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro b/tests/auto/corelib/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro index f325514015..f783455b2e 100644 --- a/tests/auto/corelib/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro +++ b/tests/auto/corelib/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro @@ -1,7 +1,7 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qtconcurrentfilter -DEFINES += QT_STRICT_ITERATORS -SOURCES += tst_qtconcurrentfilter.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qtconcurrentfilter.cpp +DEFINES += QT_STRICT_ITERATORS + 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 cf48c1e382..e876c86725 100644 --- a/tests/auto/corelib/concurrent/qtconcurrentiteratekernel/qtconcurrentiteratekernel.pro +++ b/tests/auto/corelib/concurrent/qtconcurrentiteratekernel/qtconcurrentiteratekernel.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qtconcurrentiteratekernel -SOURCES += tst_qtconcurrentiteratekernel.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qtconcurrentiteratekernel.cpp diff --git a/tests/auto/corelib/concurrent/qtconcurrentmap/qtconcurrentmap.pro b/tests/auto/corelib/concurrent/qtconcurrentmap/qtconcurrentmap.pro index 72bf95ec9e..b4f5cbc565 100644 --- a/tests/auto/corelib/concurrent/qtconcurrentmap/qtconcurrentmap.pro +++ b/tests/auto/corelib/concurrent/qtconcurrentmap/qtconcurrentmap.pro @@ -1,6 +1,5 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qtconcurrentmap -DEFINES += QT_STRICT_ITERATORS -SOURCES += tst_qtconcurrentmap.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qtconcurrentmap.cpp +DEFINES += QT_STRICT_ITERATORS diff --git a/tests/auto/corelib/concurrent/qtconcurrentresultstore/qtconcurrentresultstore.pro b/tests/auto/corelib/concurrent/qtconcurrentresultstore/qtconcurrentresultstore.pro index 037bb89089..e93fc587a7 100644 --- a/tests/auto/corelib/concurrent/qtconcurrentresultstore/qtconcurrentresultstore.pro +++ b/tests/auto/corelib/concurrent/qtconcurrentresultstore/qtconcurrentresultstore.pro @@ -1,6 +1,5 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qtconcurrentresultstore +QT = core-private testlib +SOURCES = tst_qtconcurrentresultstore.cpp DEFINES += QT_STRICT_ITERATORS -SOURCES += tst_qtconcurrentresultstore.cpp -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 19148677ec..d4f130fecd 100644 --- a/tests/auto/corelib/concurrent/qtconcurrentrun/qtconcurrentrun.pro +++ b/tests/auto/corelib/concurrent/qtconcurrentrun/qtconcurrentrun.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qtconcurrentrun -SOURCES += tst_qtconcurrentrun.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qtconcurrentrun.cpp diff --git a/tests/auto/corelib/concurrent/qtconcurrentthreadengine/qtconcurrentthreadengine.pro b/tests/auto/corelib/concurrent/qtconcurrentthreadengine/qtconcurrentthreadengine.pro index f734fc5282..536ccc3ea5 100644 --- a/tests/auto/corelib/concurrent/qtconcurrentthreadengine/qtconcurrentthreadengine.pro +++ b/tests/auto/corelib/concurrent/qtconcurrentthreadengine/qtconcurrentthreadengine.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qtconcurrentthreadengine -SOURCES += tst_qtconcurrentthreadengine.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qtconcurrentthreadengine.cpp diff --git a/tests/auto/corelib/concurrent/qthreadpool/qthreadpool.pro b/tests/auto/corelib/concurrent/qthreadpool/qthreadpool.pro index df13d5f82f..4d81218f24 100644 --- a/tests/auto/corelib/concurrent/qthreadpool/qthreadpool.pro +++ b/tests/auto/corelib/concurrent/qthreadpool/qthreadpool.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qthreadpool -SOURCES += tst_qthreadpool.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qthreadpool.cpp diff --git a/tests/auto/corelib/global/q_func_info/q_func_info.pro b/tests/auto/corelib/global/q_func_info/q_func_info.pro index d657fd80ee..d3b906a9dd 100644 --- a/tests/auto/corelib/global/q_func_info/q_func_info.pro +++ b/tests/auto/corelib/global/q_func_info/q_func_info.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_q_func_info -SOURCES += tst_q_func_info.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_q_func_info.cpp diff --git a/tests/auto/corelib/global/qflags/qflags.pro b/tests/auto/corelib/global/qflags/qflags.pro index eeb204f51f..e5d1acb087 100644 --- a/tests/auto/corelib/global/qflags/qflags.pro +++ b/tests/auto/corelib/global/qflags/qflags.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qflags -SOURCES += tst_qflags.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qflags.cpp diff --git a/tests/auto/corelib/global/qgetputenv/qgetputenv.pro b/tests/auto/corelib/global/qgetputenv/qgetputenv.pro index ccfac7b8a7..039de7a87a 100644 --- a/tests/auto/corelib/global/qgetputenv/qgetputenv.pro +++ b/tests/auto/corelib/global/qgetputenv/qgetputenv.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qgetputenv -SOURCES += tst_qgetputenv.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qgetputenv.cpp diff --git a/tests/auto/corelib/global/qglobal/qglobal.pro b/tests/auto/corelib/global/qglobal/qglobal.pro index b4bcf0524f..0f26e9854b 100644 --- a/tests/auto/corelib/global/qglobal/qglobal.pro +++ b/tests/auto/corelib/global/qglobal/qglobal.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qglobal -SOURCES += tst_qglobal.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qglobal.cpp diff --git a/tests/auto/corelib/global/qnumeric/qnumeric.pro b/tests/auto/corelib/global/qnumeric/qnumeric.pro index 67b7a8de65..cf2cc56ce6 100644 --- a/tests/auto/corelib/global/qnumeric/qnumeric.pro +++ b/tests/auto/corelib/global/qnumeric/qnumeric.pro @@ -1,7 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qnumeric - QT = core testlib - -SOURCES += tst_qnumeric.cpp -CONFIG += parallel_test +SOURCES = tst_qnumeric.cpp diff --git a/tests/auto/corelib/global/qrand/qrand.pro b/tests/auto/corelib/global/qrand/qrand.pro index 552592e2e4..911ff50ac1 100644 --- a/tests/auto/corelib/global/qrand/qrand.pro +++ b/tests/auto/corelib/global/qrand/qrand.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qrand -SOURCES += tst_qrand.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qrand.cpp diff --git a/tests/auto/corelib/io/qabstractfileengine/qabstractfileengine.pro b/tests/auto/corelib/io/qabstractfileengine/qabstractfileengine.pro index d498b530bc..d7565b5429 100644 --- a/tests/auto/corelib/io/qabstractfileengine/qabstractfileengine.pro +++ b/tests/auto/corelib/io/qabstractfileengine/qabstractfileengine.pro @@ -1,7 +1,5 @@ CONFIG += testcase TARGET = tst_qabstractfileengine QT = core testlib - SOURCES = tst_qabstractfileengine.cpp RESOURCES += qabstractfileengine.qrc - diff --git a/tests/auto/corelib/io/qbuffer/qbuffer.pro b/tests/auto/corelib/io/qbuffer/qbuffer.pro index 9745fcd862..a21af80be1 100644 --- a/tests/auto/corelib/io/qbuffer/qbuffer.pro +++ b/tests/auto/corelib/io/qbuffer/qbuffer.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qbuffer -SOURCES += tst_qbuffer.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qbuffer.cpp diff --git a/tests/auto/corelib/io/qdatastream/qdatastream.pro b/tests/auto/corelib/io/qdatastream/qdatastream.pro index 2cb4282296..2214bdb0b0 100644 --- a/tests/auto/corelib/io/qdatastream/qdatastream.pro +++ b/tests/auto/corelib/io/qdatastream/qdatastream.pro @@ -1,13 +1,13 @@ CONFIG += testcase TARGET = tst_qdatastream -SOURCES += tst_qdatastream.cpp -QT += gui widgets testlib -wince*: { - addFiles.files = datastream.q42 - addFiles.path = . - DEPLOYMENT += addFiles - DEFINES += SRCDIR=\\\"\\\" +QT = gui widgets testlib +SOURCES = tst_qdatastream.cpp + +wince* { + addFiles.files = datastream.q42 + addFiles.path = . + DEPLOYMENT += addFiles + DEFINES += SRCDIR=\\\"\\\" } else { - DEFINES += SRCDIR=\\\"$$PWD/\\\" + DEFINES += SRCDIR=\\\"$$PWD/\\\" } - diff --git a/tests/auto/corelib/io/qdebug/qdebug.pro b/tests/auto/corelib/io/qdebug/qdebug.pro index b6a91a7703..ab0260621b 100644 --- a/tests/auto/corelib/io/qdebug/qdebug.pro +++ b/tests/auto/corelib/io/qdebug/qdebug.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qdebug -SOURCES += tst_qdebug.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qdebug.cpp diff --git a/tests/auto/corelib/io/qdir/qdir.pro b/tests/auto/corelib/io/qdir/qdir.pro index 44cf644b37..c26262e826 100644 --- a/tests/auto/corelib/io/qdir/qdir.pro +++ b/tests/auto/corelib/io/qdir/qdir.pro @@ -1,19 +1,14 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qdir -SOURCES += tst_qdir.cpp +QT = core testlib +SOURCES = tst_qdir.cpp RESOURCES += qdir.qrc -QT = core testlib wince* { DirFiles.files = testdir testData searchdir resources entrylist types tst_qdir.cpp DirFiles.path = . DEPLOYMENT += DirFiles -} - -wince* { DEFINES += SRCDIR=\\\"\\\" } else { DEFINES += SRCDIR=\\\"$$PWD/\\\" } - -CONFIG += parallel_test diff --git a/tests/auto/corelib/io/qdiriterator/qdiriterator.pro b/tests/auto/corelib/io/qdiriterator/qdiriterator.pro index ea0789ae16..b51a734d10 100644 --- a/tests/auto/corelib/io/qdiriterator/qdiriterator.pro +++ b/tests/auto/corelib/io/qdiriterator/qdiriterator.pro @@ -1,9 +1,7 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qdiriterator -SOURCES += tst_qdiriterator.cpp -RESOURCES += qdiriterator.qrc QT = core testlib +SOURCES = tst_qdiriterator.cpp +RESOURCES += qdiriterator.qrc wince*mips*|wincewm50smart-msvc200*: DEFINES += WINCE_BROKEN_ITERATE=1 - -CONFIG += parallel_test diff --git a/tests/auto/corelib/io/qfile/largefile/largefile.pro b/tests/auto/corelib/io/qfile/largefile/largefile.pro index ca2a1864bd..4e629122ec 100644 --- a/tests/auto/corelib/io/qfile/largefile/largefile.pro +++ b/tests/auto/corelib/io/qfile/largefile/largefile.pro @@ -1,9 +1,6 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_largefile - QT = core testlib -SOURCES += tst_largefile.cpp +SOURCES = tst_largefile.cpp wince*: SOURCES += $$QT_SOURCE_TREE/src/corelib/kernel/qfunctions_wince.cpp - -CONFIG += parallel_test diff --git a/tests/auto/corelib/io/qfile/test/test.pro b/tests/auto/corelib/io/qfile/test/test.pro index 44dd20cf50..aca034b098 100644 --- a/tests/auto/corelib/io/qfile/test/test.pro +++ b/tests/auto/corelib/io/qfile/test/test.pro @@ -1,5 +1,7 @@ CONFIG += testcase -SOURCES += ../tst_qfile.cpp +TARGET = ../tst_qfile +SOURCES = ../tst_qfile.cpp +RESOURCES += ../qfile.qrc ../rename-fallback.qrc ../copy-fallback.qrc wince* { QT = core gui testlib @@ -11,9 +13,6 @@ wince* { resour.path = resources DEPLOYMENT += files resour -} - -wince* { SOURCES += $$QT_SOURCE_TREE/src/corelib/kernel/qfunctions_wince.cpp # needed for QT_OPEN DEFINES += SRCDIR=\\\"\\\" } else { @@ -21,10 +20,6 @@ wince* { DEFINES += SRCDIR=\\\"$$PWD/../\\\" } -RESOURCES += ../qfile.qrc ../rename-fallback.qrc ../copy-fallback.qrc - -TARGET = ../tst_qfile - win32 { CONFIG(debug, debug|release) { TARGET = ../../debug/tst_qfile diff --git a/tests/auto/corelib/io/qfileinfo/qfileinfo.pro b/tests/auto/corelib/io/qfileinfo/qfileinfo.pro index 42a045dc23..2f3fa3fded 100644 --- a/tests/auto/corelib/io/qfileinfo/qfileinfo.pro +++ b/tests/auto/corelib/io/qfileinfo/qfileinfo.pro @@ -1,26 +1,17 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qfileinfo -SOURCES += tst_qfileinfo.cpp - QT = core-private testlib - - -RESOURCES += qfileinfo.qrc +SOURCES = tst_qfileinfo.cpp +RESOURCES += qfileinfo.qrc wince* { deploy.files += qfileinfo.qrc tst_qfileinfo.cpp res.files = resources\\file1 resources\\file1.ext1 resources\\file1.ext1.ext2 res.path = resources DEPLOYMENT += deploy res -} - -win32*:LIBS += -ladvapi32 -lnetapi32 - -# support for running test from shadow build directory -wince* { DEFINES += SRCDIR=\\\"\\\" } else { DEFINES += SRCDIR=\\\"$$PWD/\\\" } -CONFIG += parallel_test +win32*:LIBS += -ladvapi32 -lnetapi32 diff --git a/tests/auto/corelib/io/qfilesystementry/qfilesystementry.pro b/tests/auto/corelib/io/qfilesystementry/qfilesystementry.pro index 7990bb69c3..382dc316e6 100644 --- a/tests/auto/corelib/io/qfilesystementry/qfilesystementry.pro +++ b/tests/auto/corelib/io/qfilesystementry/qfilesystementry.pro @@ -1,9 +1,6 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qfilesystementry - -SOURCES += tst_qfilesystementry.cpp \ +QT = core-private testlib +SOURCES = tst_qfilesystementry.cpp \ $${QT.core.sources}/io/qfilesystementry.cpp -HEADERS += $${QT.core.sources}/io/qfilesystementry_p.h -QT = core core-private testlib - -CONFIG += parallel_test +HEADERS = $${QT.core.sources}/io/qfilesystementry_p.h diff --git a/tests/auto/corelib/io/qfilesystemwatcher/qfilesystemwatcher.pro b/tests/auto/corelib/io/qfilesystemwatcher/qfilesystemwatcher.pro index aa1e37f972..8ada44fdf7 100644 --- a/tests/auto/corelib/io/qfilesystemwatcher/qfilesystemwatcher.pro +++ b/tests/auto/corelib/io/qfilesystemwatcher/qfilesystemwatcher.pro @@ -1,6 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qfilesystemwatcher -SOURCES += tst_qfilesystemwatcher.cpp QT = core testlib - -CONFIG += parallel_test +SOURCES = tst_qfilesystemwatcher.cpp diff --git a/tests/auto/corelib/io/qiodevice/qiodevice.pro b/tests/auto/corelib/io/qiodevice/qiodevice.pro index 7ef227dd57..fa5ee1492c 100644 --- a/tests/auto/corelib/io/qiodevice/qiodevice.pro +++ b/tests/auto/corelib/io/qiodevice/qiodevice.pro @@ -1,18 +1,15 @@ CONFIG += testcase TARGET = tst_qiodevice -SOURCES += tst_qiodevice.cpp - QT = core network testlib - -wince*: { - addFiles.files = tst_qiodevice.cpp - addFiles.path = . - DEPLOYMENT += addFiles - DEFINES += SRCDIR=\\\"\\\" - !wince50standard-x86-msvc2005: DEFINES += WINCE_EMULATOR_TEST=1 +SOURCES = tst_qiodevice.cpp + +wince* { + addFiles.files = tst_qiodevice.cpp + addFiles.path = . + DEPLOYMENT += addFiles + DEFINES += SRCDIR=\\\"\\\" + !wince50standard-x86-msvc2005: DEFINES += WINCE_EMULATOR_TEST=1 } else { - DEFINES += SRCDIR=\\\"$$PWD/\\\" + DEFINES += SRCDIR=\\\"$$PWD/\\\" } MOC_DIR=tmp - - diff --git a/tests/auto/corelib/io/qprocess/test/test.pro b/tests/auto/corelib/io/qprocess/test/test.pro index 3bac7eae3d..bb21f76dd1 100644 --- a/tests/auto/corelib/io/qprocess/test/test.pro +++ b/tests/auto/corelib/io/qprocess/test/test.pro @@ -1,105 +1,94 @@ CONFIG += testcase +QT = core testlib network +embedded: QT += gui +SOURCES = ../tst_qprocess.cpp -SOURCES += ../tst_qprocess.cpp !wince*: { -TARGET = ../tst_qprocess - -win32: { - CONFIG(debug, debug|release) { - TARGET = ../../debug/tst_qprocess + TARGET = ../tst_qprocess + win32: { + CONFIG(debug, debug|release) { + TARGET = ../../debug/tst_qprocess + } else { + TARGET = ../../release/tst_qprocess + } + } } else { - TARGET = ../../release/tst_qprocess - } -} -} else { - TARGET = tst_qprocess -} + TARGET = tst_qprocess + addFile_fileWriterProcess.files = $$OUT_PWD/../fileWriterProcess/fileWriterProcess.exe + addFile_fileWriterProcess.path = fileWriterProcess + addFile_testBatFiles.files = $$PWD/../testBatFiles/* + addFile_testBatFiles.path = testBatFiles + addFile_testDetached.files = $$OUT_PWD/../testDetached/testDetached.exe + addFile_testDetached.path = testDetached -QT = core testlib -QT += network + addFile_testExitCodes.files = $$OUT_PWD/../testExitCodes/testExitCodes.exe + addFile_testExitCodes.path = testExitCodes -embedded: QT += gui + addFile_testGuiProcess.files = $$OUT_PWD/../testGuiProcess/testGuiProcess.exe + addFile_testGuiProcess.path = testGuiProcess + + addFile_testProcessCrash.files = $$OUT_PWD/../testProcessCrash/testProcessCrash.exe + addFile_testProcessCrash.path = testProcessCrash + + addFile_testProcessDeadWhileReading.files = $$OUT_PWD/../testProcessDeadWhileReading/testProcessDeadWhileReading.exe + addFile_testProcessDeadWhileReading.path = testProcessDeadWhileReading + + addFile_testProcessEcho.files = $$OUT_PWD/../testProcessEcho/testProcessEcho.exe + addFile_testProcessEcho.path = testProcessEcho + + addFile_testProcessEcho2.files = $$OUT_PWD/../testProcessEcho2/testProcessEcho2.exe + addFile_testProcessEcho2.path = testProcessEcho2 + + addFile_testProcessEcho3.files = $$OUT_PWD/../testProcessEcho3/testProcessEcho3.exe + addFile_testProcessEcho3.path = testProcessEcho3 + + addFile_testProcessEOF.files = $$OUT_PWD/../testProcessEOF/testProcessEOF.exe + addFile_testProcessEOF.path = testProcessEOF + + addFile_testProcessLoopback.files = $$OUT_PWD/../testProcessLoopback/testProcessLoopback.exe + addFile_testProcessLoopback.path = testProcessLoopback + + addFile_testProcessNormal.files = $$OUT_PWD/../testProcessNormal/testProcessNormal.exe + addFile_testProcessNormal.path = testProcessNormal + + addFile_testProcessOutput.files = $$OUT_PWD/../testProcessOutput/testProcessOutput.exe + addFile_testProcessOutput.path = testProcessOutput + + addFile_testProcessNoSpacesArgs.files = $$OUT_PWD/../testProcessSpacesArgs/nospace.exe + addFile_testProcessNoSpacesArgs.path = testProcessSpacesArgs + + addFile_testProcessOneSpacesArgs.files = $$OUT_PWD/../testProcessSpacesArgs/"one space".exe + addFile_testProcessOneSpacesArgs.path = testProcessSpacesArgs + + addFile_testProcessTwoSpacesArgs.files = $$OUT_PWD/../testProcessSpacesArgs/"two space s".exe + addFile_testProcessTwoSpacesArgs.path = testProcessSpacesArgs + + addFile_testSoftExit.files = $$OUT_PWD/../testSoftExit/testSoftExit.exe + addFile_testSoftExit.path = testSoftExit + + addFile_testSpaceInName.files = $$OUT_PWD/../"test Space In Name"/testSpaceInName.exe + addFile_testSpaceInName.path = "test Space In Name" -wince*: { - - addFile_fileWriterProcess.files = $$OUT_PWD/../fileWriterProcess/fileWriterProcess.exe - addFile_fileWriterProcess.path = fileWriterProcess - - addFile_testBatFiles.files = $$PWD/../testBatFiles/* - addFile_testBatFiles.path = testBatFiles - - addFile_testDetached.files = $$OUT_PWD/../testDetached/testDetached.exe - addFile_testDetached.path = testDetached - - addFile_testExitCodes.files = $$OUT_PWD/../testExitCodes/testExitCodes.exe - addFile_testExitCodes.path = testExitCodes - - addFile_testGuiProcess.files = $$OUT_PWD/../testGuiProcess/testGuiProcess.exe - addFile_testGuiProcess.path = testGuiProcess - - addFile_testProcessCrash.files = $$OUT_PWD/../testProcessCrash/testProcessCrash.exe - addFile_testProcessCrash.path = testProcessCrash - - addFile_testProcessDeadWhileReading.files = $$OUT_PWD/../testProcessDeadWhileReading/testProcessDeadWhileReading.exe - addFile_testProcessDeadWhileReading.path = testProcessDeadWhileReading - - addFile_testProcessEcho.files = $$OUT_PWD/../testProcessEcho/testProcessEcho.exe - addFile_testProcessEcho.path = testProcessEcho - - addFile_testProcessEcho2.files = $$OUT_PWD/../testProcessEcho2/testProcessEcho2.exe - addFile_testProcessEcho2.path = testProcessEcho2 - - addFile_testProcessEcho3.files = $$OUT_PWD/../testProcessEcho3/testProcessEcho3.exe - addFile_testProcessEcho3.path = testProcessEcho3 - - addFile_testProcessEOF.files = $$OUT_PWD/../testProcessEOF/testProcessEOF.exe - addFile_testProcessEOF.path = testProcessEOF - - addFile_testProcessLoopback.files = $$OUT_PWD/../testProcessLoopback/testProcessLoopback.exe - addFile_testProcessLoopback.path = testProcessLoopback - - addFile_testProcessNormal.files = $$OUT_PWD/../testProcessNormal/testProcessNormal.exe - addFile_testProcessNormal.path = testProcessNormal - - addFile_testProcessOutput.files = $$OUT_PWD/../testProcessOutput/testProcessOutput.exe - addFile_testProcessOutput.path = testProcessOutput - - addFile_testProcessNoSpacesArgs.files = $$OUT_PWD/../testProcessSpacesArgs/nospace.exe - addFile_testProcessNoSpacesArgs.path = testProcessSpacesArgs - - addFile_testProcessOneSpacesArgs.files = $$OUT_PWD/../testProcessSpacesArgs/"one space".exe - addFile_testProcessOneSpacesArgs.path = testProcessSpacesArgs - - addFile_testProcessTwoSpacesArgs.files = $$OUT_PWD/../testProcessSpacesArgs/"two space s".exe - addFile_testProcessTwoSpacesArgs.path = testProcessSpacesArgs - - addFile_testSoftExit.files = $$OUT_PWD/../testSoftExit/testSoftExit.exe - addFile_testSoftExit.path = testSoftExit - - addFile_testSpaceInName.files = $$OUT_PWD/../"test Space In Name"/testSpaceInName.exe - addFile_testSpaceInName.path = "test Space In Name" - - - DEPLOYMENT += addFile_fileWriterProcess \ - addFile_testBatFiles \ - addFile_testDetached \ - addFile_testExitCodes \ - addFile_testGuiProcess \ - addFile_testProcessCrash \ - addFile_testProcessDeadWhileReading \ - addFile_testProcessEcho \ - addFile_testProcessEcho2 \ - addFile_testProcessEcho3 \ - addFile_testProcessEchoGui \ - addFile_testProcessEOF \ - addFile_testProcessLoopback \ - addFile_testProcessNormal \ - addFile_testProcessOutput \ - addFile_testProcessNoSpacesArgs \ - addFile_testProcessOneSpacesArgs \ - addFile_testProcessTwoSpacesArgs \ - addFile_testSoftExit \ - addFile_testSpaceInName + DEPLOYMENT += addFile_fileWriterProcess \ + addFile_testBatFiles \ + addFile_testDetached \ + addFile_testExitCodes \ + addFile_testGuiProcess \ + addFile_testProcessCrash \ + addFile_testProcessDeadWhileReading \ + addFile_testProcessEcho \ + addFile_testProcessEcho2 \ + addFile_testProcessEcho3 \ + addFile_testProcessEchoGui \ + addFile_testProcessEOF \ + addFile_testProcessLoopback \ + addFile_testProcessNormal \ + addFile_testProcessOutput \ + addFile_testProcessNoSpacesArgs \ + addFile_testProcessOneSpacesArgs \ + addFile_testProcessTwoSpacesArgs \ + addFile_testSoftExit \ + addFile_testSpaceInName } diff --git a/tests/auto/corelib/io/qprocessenvironment/qprocessenvironment.pro b/tests/auto/corelib/io/qprocessenvironment/qprocessenvironment.pro index b05b8a5265..f0443935fd 100644 --- a/tests/auto/corelib/io/qprocessenvironment/qprocessenvironment.pro +++ b/tests/auto/corelib/io/qprocessenvironment/qprocessenvironment.pro @@ -1,7 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qprocessenvironment - QT = core testlib - -SOURCES += tst_qprocessenvironment.cpp -CONFIG += parallel_test +SOURCES = tst_qprocessenvironment.cpp diff --git a/tests/auto/corelib/io/qresourceengine/qresourceengine.pro b/tests/auto/corelib/io/qresourceengine/qresourceengine.pro index 9ed11dfe64..1bb7bd9a90 100644 --- a/tests/auto/corelib/io/qresourceengine/qresourceengine.pro +++ b/tests/auto/corelib/io/qresourceengine/qresourceengine.pro @@ -1,12 +1,7 @@ -###################################################################### -# Automatically generated by qmake (2.00a) ma 2. mai 16:14:33 2005 -###################################################################### - -CONFIG += testcase +CONFIG += testcase parallel_test load(resources) - -# Input -SOURCES += tst_qresourceengine.cpp +QT = core testlib +SOURCES = tst_qresourceengine.cpp RESOURCES += testqrc/test.qrc runtime_resource.target = runtime_resource.rcc @@ -15,7 +10,6 @@ runtime_resource.commands = $$QMAKE_RCC -root /runtime_resource/ -binary $${runt QMAKE_EXTRA_TARGETS = runtime_resource PRE_TARGETDEPS += $${runtime_resource.target} -QT = core testlib wince* { deploy.files += runtime_resource.rcc parentdir.txt test.files = testqrc/* @@ -37,6 +31,5 @@ wince* { DEPLOYMENT += deploy test alias other search1 search2 sub testsub testsub2 DEFINES += SRCDIR=\\\"\\\" } else { - DEFINES += SRCDIR=\\\"$$PWD/\\\" + DEFINES += SRCDIR=\\\"$$PWD/\\\" } -CONFIG += parallel_test diff --git a/tests/auto/corelib/io/qsettings/qsettings.pro b/tests/auto/corelib/io/qsettings/qsettings.pro index ac85ea8f41..1772f4b65f 100644 --- a/tests/auto/corelib/io/qsettings/qsettings.pro +++ b/tests/auto/corelib/io/qsettings/qsettings.pro @@ -1,11 +1,7 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qsettings - -QT += core-private testlib - -SOURCES += tst_qsettings.cpp +QT = core-private gui testlib +SOURCES = tst_qsettings.cpp RESOURCES += qsettings.qrc win32-msvc*:LIBS += advapi32.lib - -CONFIG += parallel_test diff --git a/tests/auto/corelib/io/qstandardpaths/qstandardpaths.pro b/tests/auto/corelib/io/qstandardpaths/qstandardpaths.pro index 983f87ac6f..c39204af51 100644 --- a/tests/auto/corelib/io/qstandardpaths/qstandardpaths.pro +++ b/tests/auto/corelib/io/qstandardpaths/qstandardpaths.pro @@ -1,8 +1,7 @@ +CONFIG += testcase parallel_test TARGET = tst_qstandardpaths -CONFIG += testcase -SOURCES += tst_qstandardpaths.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qstandardpaths.cpp wince* { DEFINES += SRCDIR=\\\"\\\" diff --git a/tests/auto/corelib/io/qtemporaryfile/qtemporaryfile.pro b/tests/auto/corelib/io/qtemporaryfile/qtemporaryfile.pro index 0c43b9c39c..b9650b8dde 100644 --- a/tests/auto/corelib/io/qtemporaryfile/qtemporaryfile.pro +++ b/tests/auto/corelib/io/qtemporaryfile/qtemporaryfile.pro @@ -1,8 +1,5 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qtemporaryfile -SOURCES += tst_qtemporaryfile.cpp QT = core testlib - +SOURCES = tst_qtemporaryfile.cpp DEFINES += SRCDIR=\\\"$$PWD/\\\" - -CONFIG += parallel_test diff --git a/tests/auto/corelib/io/qtextstream/test/test.pro b/tests/auto/corelib/io/qtextstream/test/test.pro index 8a0c9d4fb1..cf53f44833 100644 --- a/tests/auto/corelib/io/qtextstream/test/test.pro +++ b/tests/auto/corelib/io/qtextstream/test/test.pro @@ -1,20 +1,17 @@ CONFIG += testcase -SOURCES += ../tst_qtextstream.cpp - TARGET = ../tst_qtextstream +QT = core network testlib +SOURCES = ../tst_qtextstream.cpp +RESOURCES += ../qtextstream.qrc win32 { - CONFIG(debug, debug|release) { - TARGET = ../../debug/tst_qtextstream -} else { - TARGET = ../../release/tst_qtextstream - } + CONFIG(debug, debug|release) { + TARGET = ../../debug/tst_qtextstream + } else { + TARGET = ../../release/tst_qtextstream + } } -RESOURCES += ../qtextstream.qrc - -QT = core network testlib - wince* { addFiles.files = ../rfc3261.txt ../shift-jis.txt ../task113817.txt ../qtextstream.qrc ../tst_qtextstream.cpp addFiles.path = . diff --git a/tests/auto/corelib/io/qurl/qurl.pro b/tests/auto/corelib/io/qurl/qurl.pro index 99aeb56d37..84538c0859 100644 --- a/tests/auto/corelib/io/qurl/qurl.pro +++ b/tests/auto/corelib/io/qurl/qurl.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qurl -SOURCES += tst_qurl.cpp -QT = core core-private testlib -CONFIG += parallel_test +QT = core-private testlib +SOURCES = tst_qurl.cpp diff --git a/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro b/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro index b3551dad9f..ba4435f4c8 100644 --- a/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro +++ b/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro @@ -1,8 +1,8 @@ CONFIG += testcase TARGET = tst_qabstractitemmodel +QT = widgets testlib mtdir = ../../../integrationtests/modeltest INCLUDEPATH += $$PWD/$${mtdir} -QT += widgets testlib -SOURCES += tst_qabstractitemmodel.cpp $${mtdir}/dynamictreemodel.cpp $${mtdir}/modeltest.cpp -HEADERS += $${mtdir}/dynamictreemodel.h $${mtdir}/modeltest.h +SOURCES = tst_qabstractitemmodel.cpp $${mtdir}/dynamictreemodel.cpp $${mtdir}/modeltest.cpp +HEADERS = $${mtdir}/dynamictreemodel.h $${mtdir}/modeltest.h diff --git a/tests/auto/corelib/kernel/qcoreapplication/qcoreapplication.pro b/tests/auto/corelib/kernel/qcoreapplication/qcoreapplication.pro index 33ac65d9ee..f9a38c2f14 100644 --- a/tests/auto/corelib/kernel/qcoreapplication/qcoreapplication.pro +++ b/tests/auto/corelib/kernel/qcoreapplication/qcoreapplication.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qcoreapplication -SOURCES += tst_qcoreapplication.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qcoreapplication.cpp diff --git a/tests/auto/corelib/kernel/qeventloop/qeventloop.pro b/tests/auto/corelib/kernel/qeventloop/qeventloop.pro index 822878e7d2..0fee018bf1 100644 --- a/tests/auto/corelib/kernel/qeventloop/qeventloop.pro +++ b/tests/auto/corelib/kernel/qeventloop/qeventloop.pro @@ -1,7 +1,6 @@ CONFIG += testcase TARGET = tst_qeventloop -SOURCES += tst_qeventloop.cpp -QT -= gui -QT += network testlib +QT = network testlib +SOURCES = tst_qeventloop.cpp win32:!wince*:LIBS += -luser32 diff --git a/tests/auto/corelib/kernel/qitemmodel/qitemmodel.pro b/tests/auto/corelib/kernel/qitemmodel/qitemmodel.pro index f02b14997f..89e0129f17 100644 --- a/tests/auto/corelib/kernel/qitemmodel/qitemmodel.pro +++ b/tests/auto/corelib/kernel/qitemmodel/qitemmodel.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qitemmodel -SOURCES += tst_qitemmodel.cpp - -QT += widgets sql testlib +QT = widgets sql testlib +SOURCES = tst_qitemmodel.cpp # NOTE: The deployment of the sqldrivers is disabled on purpose. # If we deploy the plugins, they are loaded twice when running diff --git a/tests/auto/corelib/kernel/qmath/qmath.pro b/tests/auto/corelib/kernel/qmath/qmath.pro index 90e61d7132..7d13d724fe 100644 --- a/tests/auto/corelib/kernel/qmath/qmath.pro +++ b/tests/auto/corelib/kernel/qmath/qmath.pro @@ -1,7 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qmath - QT = core testlib - -SOURCES += tst_qmath.cpp -CONFIG += parallel_test +SOURCES = tst_qmath.cpp diff --git a/tests/auto/corelib/kernel/qmetaobject/qmetaobject.pro b/tests/auto/corelib/kernel/qmetaobject/qmetaobject.pro index d5fc3d2ee8..e7c20d8408 100644 --- a/tests/auto/corelib/kernel/qmetaobject/qmetaobject.pro +++ b/tests/auto/corelib/kernel/qmetaobject/qmetaobject.pro @@ -1,9 +1,4 @@ CONFIG += testcase TARGET = tst_qmetaobject - QT = core gui widgets testlib - -SOURCES += tst_qmetaobject.cpp - - - +SOURCES = tst_qmetaobject.cpp diff --git a/tests/auto/corelib/kernel/qmetaobjectbuilder/qmetaobjectbuilder.pro b/tests/auto/corelib/kernel/qmetaobjectbuilder/qmetaobjectbuilder.pro index eb9810dd53..5380f90e75 100644 --- a/tests/auto/corelib/kernel/qmetaobjectbuilder/qmetaobjectbuilder.pro +++ b/tests/auto/corelib/kernel/qmetaobjectbuilder/qmetaobjectbuilder.pro @@ -1,9 +1,5 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qmetaobjectbuilder +QT = core-private gui-private testlib +SOURCES = tst_qmetaobjectbuilder.cpp macx:CONFIG -= app_bundle - -SOURCES += \ - tst_qmetaobjectbuilder.cpp - -CONFIG += parallel_test -QT += core-private gui-private testlib diff --git a/tests/auto/corelib/kernel/qmetaproperty/qmetaproperty.pro b/tests/auto/corelib/kernel/qmetaproperty/qmetaproperty.pro index 4ceb253125..e097b38919 100644 --- a/tests/auto/corelib/kernel/qmetaproperty/qmetaproperty.pro +++ b/tests/auto/corelib/kernel/qmetaproperty/qmetaproperty.pro @@ -1,5 +1,4 @@ CONFIG += testcase TARGET = tst_qmetaproperty QT = core gui testlib -SOURCES += tst_qmetaproperty.cpp - +SOURCES = tst_qmetaproperty.cpp diff --git a/tests/auto/corelib/kernel/qmetatype/qmetatype.pro b/tests/auto/corelib/kernel/qmetatype/qmetatype.pro index 2841c5f139..aa7d59b567 100644 --- a/tests/auto/corelib/kernel/qmetatype/qmetatype.pro +++ b/tests/auto/corelib/kernel/qmetatype/qmetatype.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qmetatype -SOURCES += tst_qmetatype.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qmetatype.cpp diff --git a/tests/auto/corelib/kernel/qmimedata/qmimedata.pro b/tests/auto/corelib/kernel/qmimedata/qmimedata.pro index e4cf4ce1a6..30b4e668ac 100644 --- a/tests/auto/corelib/kernel/qmimedata/qmimedata.pro +++ b/tests/auto/corelib/kernel/qmimedata/qmimedata.pro @@ -1,5 +1,4 @@ CONFIG += testcase TARGET = tst_qmimedata -SOURCES += tst_qmimedata.cpp -QT += testlib - +QT = gui testlib +SOURCES = tst_qmimedata.cpp diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.pro b/tests/auto/corelib/kernel/qobject/tst_qobject.pro index b52e25bb3b..bbc02ce34d 100644 --- a/tests/auto/corelib/kernel/qobject/tst_qobject.pro +++ b/tests/auto/corelib/kernel/qobject/tst_qobject.pro @@ -1,16 +1,13 @@ CONFIG += testcase TARGET = tst_qobject -SOURCES += tst_qobject.cpp +QT = core-private network gui testlib +SOURCES = tst_qobject.cpp # this is here for a reason, moc_oldnormalizedobject.cpp is not auto-generated, it was generated by # moc from Qt 4.6, and should *not* be generated by the current moc SOURCES += moc_oldnormalizeobject.cpp -QT = core-private \ - network \ - gui \ - testlib -wince*: { +wince* { addFiles.files = signalbug.exe addFiles.path = . DEPLOYMENT += addFiles diff --git a/tests/auto/corelib/kernel/qpointer/qpointer.pro b/tests/auto/corelib/kernel/qpointer/qpointer.pro index 33a31ebc8c..db1a75c3b6 100644 --- a/tests/auto/corelib/kernel/qpointer/qpointer.pro +++ b/tests/auto/corelib/kernel/qpointer/qpointer.pro @@ -1,6 +1,4 @@ CONFIG += testcase TARGET = tst_qpointer -QT += widgets testlib -SOURCES += tst_qpointer.cpp - - +QT = widgets testlib +SOURCES = tst_qpointer.cpp diff --git a/tests/auto/corelib/kernel/qsignalmapper/qsignalmapper.pro b/tests/auto/corelib/kernel/qsignalmapper/qsignalmapper.pro index 4bca1ab67b..5ec67cd21f 100644 --- a/tests/auto/corelib/kernel/qsignalmapper/qsignalmapper.pro +++ b/tests/auto/corelib/kernel/qsignalmapper/qsignalmapper.pro @@ -1,7 +1,4 @@ CONFIG += testcase TARGET = tst_qsignalmapper -QT += widgets testlib -SOURCES += tst_qsignalmapper.cpp - - - +QT = widgets testlib +SOURCES = tst_qsignalmapper.cpp diff --git a/tests/auto/corelib/kernel/qsocketnotifier/qsocketnotifier.pro b/tests/auto/corelib/kernel/qsocketnotifier/qsocketnotifier.pro index 0ec91793e4..58e4b98af7 100644 --- a/tests/auto/corelib/kernel/qsocketnotifier/qsocketnotifier.pro +++ b/tests/auto/corelib/kernel/qsocketnotifier/qsocketnotifier.pro @@ -1,7 +1,7 @@ CONFIG += testcase TARGET = tst_qsocketnotifier -SOURCES += tst_qsocketnotifier.cpp QT = core-private network-private testlib +SOURCES = tst_qsocketnotifier.cpp requires(contains(QT_CONFIG,private_tests)) diff --git a/tests/auto/corelib/kernel/qtimer/qtimer.pro b/tests/auto/corelib/kernel/qtimer/qtimer.pro index 1b2422826d..a52141f927 100644 --- a/tests/auto/corelib/kernel/qtimer/qtimer.pro +++ b/tests/auto/corelib/kernel/qtimer/qtimer.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qtimer QT = core testlib -SOURCES += tst_qtimer.cpp -CONFIG += parallel_test +SOURCES = tst_qtimer.cpp diff --git a/tests/auto/corelib/kernel/qtranslator/qtranslator.pro b/tests/auto/corelib/kernel/qtranslator/qtranslator.pro index 0582499b2d..603b128601 100644 --- a/tests/auto/corelib/kernel/qtranslator/qtranslator.pro +++ b/tests/auto/corelib/kernel/qtranslator/qtranslator.pro @@ -1,7 +1,7 @@ CONFIG += testcase TARGET = tst_qtranslator -QT += widgets testlib -SOURCES += tst_qtranslator.cpp +QT = widgets testlib +SOURCES = tst_qtranslator.cpp RESOURCES += qtranslator.qrc wince* { diff --git a/tests/auto/corelib/kernel/qvariant/qvariant.pro b/tests/auto/corelib/kernel/qvariant/qvariant.pro index 7d9cfc288f..00932f9576 100644 --- a/tests/auto/corelib/kernel/qvariant/qvariant.pro +++ b/tests/auto/corelib/kernel/qvariant/qvariant.pro @@ -1,4 +1,4 @@ CONFIG += testcase TARGET = tst_qvariant -SOURCES += tst_qvariant.cpp -QT += widgets network testlib +QT = widgets network testlib +SOURCES = tst_qvariant.cpp diff --git a/tests/auto/corelib/kernel/qwineventnotifier/qwineventnotifier.pro b/tests/auto/corelib/kernel/qwineventnotifier/qwineventnotifier.pro index 296aab32a8..b0f194c1dd 100644 --- a/tests/auto/corelib/kernel/qwineventnotifier/qwineventnotifier.pro +++ b/tests/auto/corelib/kernel/qwineventnotifier/qwineventnotifier.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qwineventnotifier -SOURCES += tst_qwineventnotifier.cpp -QT = core core-private testlib -CONFIG += parallel_test +QT = core-private testlib +SOURCES = tst_qwineventnotifier.cpp diff --git a/tests/auto/corelib/plugin/qlibrary/tst/tst.pro b/tests/auto/corelib/plugin/qlibrary/tst/tst.pro index c5035a8d67..a1854ad419 100644 --- a/tests/auto/corelib/plugin/qlibrary/tst/tst.pro +++ b/tests/auto/corelib/plugin/qlibrary/tst/tst.pro @@ -1,22 +1,21 @@ CONFIG += testcase -SOURCES += ../tst_qlibrary.cpp -TARGET = ../tst_qlibrary +TARGET = ../tst_qlibrary QT = core testlib +SOURCES = ../tst_qlibrary.cpp win32 { - CONFIG(debug, debug|release) { - TARGET = ../../debug/tst_qlibrary -} else { - TARGET = ../../release/tst_qlibrary - } + CONFIG(debug, debug|release) { + TARGET = ../../debug/tst_qlibrary + } else { + TARGET = ../../release/tst_qlibrary + } } -wince*: { - addFiles.files = ../*.dll ../*.dl2 ../mylib_noextension - addFiles.path = . - DEPLOYMENT += addFiles - DEFINES += SRCDIR=\\\"\\\" +wince* { + addFiles.files = ../*.dll ../*.dl2 ../mylib_noextension + addFiles.path = . + DEPLOYMENT += addFiles + DEFINES += SRCDIR=\\\"\\\" } else { - DEFINES += SRCDIR=\\\"$$PWD/../\\\" + DEFINES += SRCDIR=\\\"$$PWD/../\\\" } - diff --git a/tests/auto/corelib/plugin/qplugin/tst_qplugin.pro b/tests/auto/corelib/plugin/qplugin/tst_qplugin.pro index 894be1c13b..a569cfffb7 100644 --- a/tests/auto/corelib/plugin/qplugin/tst_qplugin.pro +++ b/tests/auto/corelib/plugin/qplugin/tst_qplugin.pro @@ -1,10 +1,9 @@ CONFIG += testcase TARGET = tst_qplugin - -SOURCES = tst_qplugin.cpp QT = core testlib +SOURCES = tst_qplugin.cpp -wince*: { +wince* { plugins.files = plugins/* plugins.path = plugins DEPLOYMENT += plugins diff --git a/tests/auto/corelib/plugin/qpluginloader/tst/tst.pro b/tests/auto/corelib/plugin/qpluginloader/tst/tst.pro index 4a11bf4935..8714597988 100644 --- a/tests/auto/corelib/plugin/qpluginloader/tst/tst.pro +++ b/tests/auto/corelib/plugin/qpluginloader/tst/tst.pro @@ -1,25 +1,22 @@ CONFIG += testcase -SOURCES += ../tst_qpluginloader.cpp TARGET = ../tst_qpluginloader QT = core testlib -HEADERS += ../theplugin/plugininterface.h +SOURCES = ../tst_qpluginloader.cpp +HEADERS = ../theplugin/plugininterface.h +DEFINES += SRCDIR=\\\"$$PWD/../\\\" win32 { - CONFIG(debug, debug|release) { - TARGET = ../../debug/tst_qpluginloader -} else { - TARGET = ../../release/tst_qpluginloader - } + CONFIG(debug, debug|release) { + TARGET = ../../debug/tst_qpluginloader + } else { + TARGET = ../../release/tst_qpluginloader + } } - -wince*: { +wince* { addFiles.files = $$OUT_PWD/../bin/*.dll addFiles.path = bin DEPLOYMENT += addFiles } -DEFINES += SRCDIR=\\\"$$PWD/../\\\" -mac*:CONFIG+=insignificant_test - CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/corelib/plugin/quuid/test/test.pro b/tests/auto/corelib/plugin/quuid/test/test.pro index 0063493821..4999177a48 100644 --- a/tests/auto/corelib/plugin/quuid/test/test.pro +++ b/tests/auto/corelib/plugin/quuid/test/test.pro @@ -1,22 +1,20 @@ CONFIG += testcase - -QT = core testlib -SOURCES += ../tst_quuid.cpp TARGET = tst_quuid +QT = core testlib +SOURCES = ../tst_quuid.cpp CONFIG(debug_and_release_target) { - CONFIG(debug, debug|release) { - DESTDIR = ../debug - } else { - DESTDIR = ../release - } + CONFIG(debug, debug|release) { + DESTDIR = ../debug + } else { + DESTDIR = ../release + } } else { - DESTDIR = .. + DESTDIR = .. } wince* { - addFile_processUniqueness.files = $$OUT_PWD/../testProcessUniqueness/testProcessUniqueness.exe - addFile_processUniqueness.path = testProcessUniqueness - - DEPLOYMENT += addFile_processUniqueness + addFile_processUniqueness.files = $$OUT_PWD/../testProcessUniqueness/testProcessUniqueness.exe + addFile_processUniqueness.path = testProcessUniqueness + DEPLOYMENT += addFile_processUniqueness } diff --git a/tests/auto/corelib/statemachine/qstate/qstate.pro b/tests/auto/corelib/statemachine/qstate/qstate.pro index 243a6963a5..7bd51ca25d 100644 --- a/tests/auto/corelib/statemachine/qstate/qstate.pro +++ b/tests/auto/corelib/statemachine/qstate/qstate.pro @@ -1,7 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qstate QT = core testlib -SOURCES += tst_qstate.cpp - - -CONFIG += parallel_test +SOURCES = tst_qstate.cpp diff --git a/tests/auto/corelib/statemachine/qstatemachine/qstatemachine.pro b/tests/auto/corelib/statemachine/qstatemachine/qstatemachine.pro index 1997e21726..3b7c11b7d6 100644 --- a/tests/auto/corelib/statemachine/qstatemachine/qstatemachine.pro +++ b/tests/auto/corelib/statemachine/qstatemachine/qstatemachine.pro @@ -1,6 +1,4 @@ CONFIG += testcase TARGET = tst_qstatemachine -QT += widgets testlib -QT += core core-private gui widgets -SOURCES += tst_qstatemachine.cpp - +QT = core-private testlib gui widgets +SOURCES = tst_qstatemachine.cpp diff --git a/tests/auto/corelib/thread/qatomicint/qatomicint.pro b/tests/auto/corelib/thread/qatomicint/qatomicint.pro index dd18c7d6db..eb11268c08 100644 --- a/tests/auto/corelib/thread/qatomicint/qatomicint.pro +++ b/tests/auto/corelib/thread/qatomicint/qatomicint.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qatomicint -SOURCES += tst_qatomicint.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qatomicint.cpp diff --git a/tests/auto/corelib/thread/qatomicpointer/qatomicpointer.pro b/tests/auto/corelib/thread/qatomicpointer/qatomicpointer.pro index dc6c54a2da..ea65ae52af 100644 --- a/tests/auto/corelib/thread/qatomicpointer/qatomicpointer.pro +++ b/tests/auto/corelib/thread/qatomicpointer/qatomicpointer.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qatomicpointer -SOURCES += tst_qatomicpointer.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qatomicpointer.cpp diff --git a/tests/auto/corelib/thread/qmutex/qmutex.pro b/tests/auto/corelib/thread/qmutex/qmutex.pro index cf567c2f65..4aa1dbcc26 100644 --- a/tests/auto/corelib/thread/qmutex/qmutex.pro +++ b/tests/auto/corelib/thread/qmutex/qmutex.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qmutex -SOURCES += tst_qmutex.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qmutex.cpp diff --git a/tests/auto/corelib/thread/qmutexlocker/qmutexlocker.pro b/tests/auto/corelib/thread/qmutexlocker/qmutexlocker.pro index 9e44b5f84c..a8b1fad7a4 100644 --- a/tests/auto/corelib/thread/qmutexlocker/qmutexlocker.pro +++ b/tests/auto/corelib/thread/qmutexlocker/qmutexlocker.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qmutexlocker -SOURCES += tst_qmutexlocker.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qmutexlocker.cpp diff --git a/tests/auto/corelib/thread/qreadlocker/qreadlocker.pro b/tests/auto/corelib/thread/qreadlocker/qreadlocker.pro index 13cdf0c58b..4cda8d30c1 100644 --- a/tests/auto/corelib/thread/qreadlocker/qreadlocker.pro +++ b/tests/auto/corelib/thread/qreadlocker/qreadlocker.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qreadlocker -SOURCES += tst_qreadlocker.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qreadlocker.cpp diff --git a/tests/auto/corelib/thread/qreadwritelock/qreadwritelock.pro b/tests/auto/corelib/thread/qreadwritelock/qreadwritelock.pro index c35023d46e..59f7d88f1f 100644 --- a/tests/auto/corelib/thread/qreadwritelock/qreadwritelock.pro +++ b/tests/auto/corelib/thread/qreadwritelock/qreadwritelock.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qreadwritelock -SOURCES += tst_qreadwritelock.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qreadwritelock.cpp diff --git a/tests/auto/corelib/thread/qsemaphore/qsemaphore.pro b/tests/auto/corelib/thread/qsemaphore/qsemaphore.pro index 871bd97105..cd87e68848 100644 --- a/tests/auto/corelib/thread/qsemaphore/qsemaphore.pro +++ b/tests/auto/corelib/thread/qsemaphore/qsemaphore.pro @@ -1,8 +1,6 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qsemaphore -SOURCES += tst_qsemaphore.cpp QT = core testlib +SOURCES = tst_qsemaphore.cpp - -CONFIG += parallel_test mac*:CONFIG+=insignificant_test diff --git a/tests/auto/corelib/thread/qthread/qthread.pro b/tests/auto/corelib/thread/qthread/qthread.pro index da3be3bf76..cbaf01c14c 100644 --- a/tests/auto/corelib/thread/qthread/qthread.pro +++ b/tests/auto/corelib/thread/qthread/qthread.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qthread -SOURCES += tst_qthread.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qthread.cpp diff --git a/tests/auto/corelib/thread/qthreadonce/qthreadonce.pro b/tests/auto/corelib/thread/qthreadonce/qthreadonce.pro index cd97917165..8fda1b71d7 100644 --- a/tests/auto/corelib/thread/qthreadonce/qthreadonce.pro +++ b/tests/auto/corelib/thread/qthreadonce/qthreadonce.pro @@ -1,7 +1,7 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qthreadonce -SOURCES += tst_qthreadonce.cpp QT = core testlib +SOURCES = tst_qthreadonce.cpp # Don't use gcc's threadsafe statics # Note: some versions of gcc generate invalid code with this option... @@ -10,5 +10,3 @@ QT = core testlib # Temporary: SOURCES += qthreadonce.cpp - -CONFIG += parallel_test diff --git a/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.pro b/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.pro index 64f176748d..15ced107d3 100644 --- a/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.pro +++ b/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.pro @@ -1,4 +1,4 @@ CONFIG += testcase TARGET = tst_qthreadstorage -SOURCES += tst_qthreadstorage.cpp QT = core testlib +SOURCES = tst_qthreadstorage.cpp diff --git a/tests/auto/corelib/thread/qwaitcondition/qwaitcondition.pro b/tests/auto/corelib/thread/qwaitcondition/qwaitcondition.pro index b9cf3af5b3..0fb3b46d4b 100644 --- a/tests/auto/corelib/thread/qwaitcondition/qwaitcondition.pro +++ b/tests/auto/corelib/thread/qwaitcondition/qwaitcondition.pro @@ -1,7 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qwaitcondition -SOURCES += tst_qwaitcondition.cpp QT = core testlib - - -CONFIG += parallel_test +SOURCES = tst_qwaitcondition.cpp diff --git a/tests/auto/corelib/thread/qwritelocker/qwritelocker.pro b/tests/auto/corelib/thread/qwritelocker/qwritelocker.pro index 946e75ca06..31717fdcb6 100644 --- a/tests/auto/corelib/thread/qwritelocker/qwritelocker.pro +++ b/tests/auto/corelib/thread/qwritelocker/qwritelocker.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qwritelocker -SOURCES += tst_qwritelocker.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qwritelocker.cpp 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 diff --git a/tests/auto/corelib/xml/qxmlstream/qxmlstream.pro b/tests/auto/corelib/xml/qxmlstream/qxmlstream.pro index 160aaf898c..f2534ca82d 100644 --- a/tests/auto/corelib/xml/qxmlstream/qxmlstream.pro +++ b/tests/auto/corelib/xml/qxmlstream/qxmlstream.pro @@ -1,14 +1,13 @@ CONFIG += testcase TARGET = tst_qxmlstream -SOURCES += tst_qxmlstream.cpp - QT = core xml network testlib +SOURCES = tst_qxmlstream.cpp wince* { addFiles.files = data XML-Test-Suite addFiles.path = . DEPLOYMENT += addFiles - wince*:DEFINES += SRCDIR=\\\"\\\" + DEFINES += SRCDIR=\\\"\\\" } else { DEFINES += SRCDIR=\\\"$$PWD/\\\" } |