From: Rohan McGovern <rohan.mcgovern@nokia.com>
Date: Tue, 25 Oct 2011 01:26:19 +0000 (+1000)
Subject: corelib: eliminated usage of qttest_p4.prf
X-Git-Tag: qt-v5.0.0-alpha1~3072
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=07102cebded5b54acdb8d20f3e49be0aa0c2c1e2;p=profile%2Fivi%2Fqtbase.git

corelib: eliminated usage of qttest_p4.prf

qttest_p4.prf was added as a convenience for Qt's own autotests in Qt4.
It enables various crufty undocumented magic, of dubious value.
Stop using it, and explicitly enable the things from it which we want.

Change-Id: I7c1ffe9c8c294dbdc988e1582e580b1ed3f4593e
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
---

diff --git a/tests/auto/corelib/animation/qabstractanimation/qabstractanimation.pro b/tests/auto/corelib/animation/qabstractanimation/qabstractanimation.pro
index f518423..a948003 100644
--- a/tests/auto/corelib/animation/qabstractanimation/qabstractanimation.pro
+++ b/tests/auto/corelib/animation/qabstractanimation/qabstractanimation.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT = core
+CONFIG += testcase
+TARGET = tst_qabstractanimation
+QT = core testlib
 SOURCES  += tst_qabstractanimation.cpp \
 
 
diff --git a/tests/auto/corelib/animation/qanimationgroup/qanimationgroup.pro b/tests/auto/corelib/animation/qanimationgroup/qanimationgroup.pro
index 5e1be0c..179412a 100644
--- a/tests/auto/corelib/animation/qanimationgroup/qanimationgroup.pro
+++ b/tests/auto/corelib/animation/qanimationgroup/qanimationgroup.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT = core
+CONFIG += testcase
+TARGET = tst_qanimationgroup
+QT = core testlib
 SOURCES  += tst_qanimationgroup.cpp
 
 
diff --git a/tests/auto/corelib/animation/qparallelanimationgroup/qparallelanimationgroup.pro b/tests/auto/corelib/animation/qparallelanimationgroup/qparallelanimationgroup.pro
index f2cacd3..e18d17b 100644
--- a/tests/auto/corelib/animation/qparallelanimationgroup/qparallelanimationgroup.pro
+++ b/tests/auto/corelib/animation/qparallelanimationgroup/qparallelanimationgroup.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT = core gui
+CONFIG += testcase
+TARGET = tst_qparallelanimationgroup
+QT = core gui testlib
 SOURCES  += tst_qparallelanimationgroup.cpp
 
 
diff --git a/tests/auto/corelib/animation/qpauseanimation/qpauseanimation.pro b/tests/auto/corelib/animation/qpauseanimation/qpauseanimation.pro
index 7f612b6..e254c67 100644
--- a/tests/auto/corelib/animation/qpauseanimation/qpauseanimation.pro
+++ b/tests/auto/corelib/animation/qpauseanimation/qpauseanimation.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT = core core-private gui gui-private
+CONFIG += testcase
+TARGET = tst_qpauseanimation
+QT = core core-private gui 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 4dfd558..2286688 100644
--- a/tests/auto/corelib/animation/qpropertyanimation/qpropertyanimation.pro
+++ b/tests/auto/corelib/animation/qpropertyanimation/qpropertyanimation.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT = core gui widgets
+CONFIG += testcase
+TARGET = tst_qpropertyanimation
+QT = core gui widgets testlib
 SOURCES  += tst_qpropertyanimation.cpp
 
 
diff --git a/tests/auto/corelib/animation/qsequentialanimationgroup/qsequentialanimationgroup.pro b/tests/auto/corelib/animation/qsequentialanimationgroup/qsequentialanimationgroup.pro
index c0c10c0..810e0a7 100644
--- a/tests/auto/corelib/animation/qsequentialanimationgroup/qsequentialanimationgroup.pro
+++ b/tests/auto/corelib/animation/qsequentialanimationgroup/qsequentialanimationgroup.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT = core
+CONFIG += testcase
+TARGET = tst_qsequentialanimationgroup
+QT = core testlib
 SOURCES  += tst_qsequentialanimationgroup.cpp
 
 
diff --git a/tests/auto/corelib/animation/qvariantanimation/qvariantanimation.pro b/tests/auto/corelib/animation/qvariantanimation/qvariantanimation.pro
index 6c46305..2b16d69 100644
--- a/tests/auto/corelib/animation/qvariantanimation/qvariantanimation.pro
+++ b/tests/auto/corelib/animation/qvariantanimation/qvariantanimation.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT = core
+CONFIG += testcase
+TARGET = tst_qvariantanimation
+QT = core testlib
 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 1ec278d..6178fcf 100644
--- a/tests/auto/corelib/codecs/qtextcodec/test/test.pro
+++ b/tests/auto/corelib/codecs/qtextcodec/test/test.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+QT += testlib
 
 SOURCES  += ../tst_qtextcodec.cpp
 
diff --git a/tests/auto/corelib/concurrent/qfuture/qfuture.pro b/tests/auto/corelib/concurrent/qfuture/qfuture.pro
index 0e74f47..606c15a 100644
--- a/tests/auto/corelib/concurrent/qfuture/qfuture.pro
+++ b/tests/auto/corelib/concurrent/qfuture/qfuture.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qfuture
 DEFINES += QT_STRICT_ITERATORS
 SOURCES += tst_qfuture.cpp
-QT = core core-private
+QT = core core-private testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/concurrent/qfuturesynchronizer/qfuturesynchronizer.pro b/tests/auto/corelib/concurrent/qfuturesynchronizer/qfuturesynchronizer.pro
index 11012cc..18cc00d 100644
--- a/tests/auto/corelib/concurrent/qfuturesynchronizer/qfuturesynchronizer.pro
+++ b/tests/auto/corelib/concurrent/qfuturesynchronizer/qfuturesynchronizer.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT = core
+CONFIG += testcase
+TARGET = tst_qfuturesynchronizer
+QT = core testlib
 SOURCES  += tst_qfuturesynchronizer.cpp \
 
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/concurrent/qfuturewatcher/qfuturewatcher.pro b/tests/auto/corelib/concurrent/qfuturewatcher/qfuturewatcher.pro
index 9de37d0..a692321 100644
--- a/tests/auto/corelib/concurrent/qfuturewatcher/qfuturewatcher.pro
+++ b/tests/auto/corelib/concurrent/qfuturewatcher/qfuturewatcher.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qfuturewatcher
 SOURCES += tst_qfuturewatcher.cpp 
-QT = core core-private
+QT = core core-private testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro b/tests/auto/corelib/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro
index c5cfb2a..f325514 100644
--- a/tests/auto/corelib/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro
+++ b/tests/auto/corelib/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qtconcurrentfilter
 DEFINES += QT_STRICT_ITERATORS
 SOURCES += tst_qtconcurrentfilter.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
 CONFIG += insignificant_test # See QTBUG-20688
diff --git a/tests/auto/corelib/concurrent/qtconcurrentiteratekernel/qtconcurrentiteratekernel.pro b/tests/auto/corelib/concurrent/qtconcurrentiteratekernel/qtconcurrentiteratekernel.pro
index c8cfe4c..cf48c1e 100644
--- a/tests/auto/corelib/concurrent/qtconcurrentiteratekernel/qtconcurrentiteratekernel.pro
+++ b/tests/auto/corelib/concurrent/qtconcurrentiteratekernel/qtconcurrentiteratekernel.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qtconcurrentiteratekernel
 SOURCES += tst_qtconcurrentiteratekernel.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/concurrent/qtconcurrentmap/qtconcurrentmap.pro b/tests/auto/corelib/concurrent/qtconcurrentmap/qtconcurrentmap.pro
index 4edfc64..72bf95e 100644
--- a/tests/auto/corelib/concurrent/qtconcurrentmap/qtconcurrentmap.pro
+++ b/tests/auto/corelib/concurrent/qtconcurrentmap/qtconcurrentmap.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qtconcurrentmap
 DEFINES += QT_STRICT_ITERATORS
 SOURCES += tst_qtconcurrentmap.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/concurrent/qtconcurrentresultstore/qtconcurrentresultstore.pro b/tests/auto/corelib/concurrent/qtconcurrentresultstore/qtconcurrentresultstore.pro
index 8bc20c3..037bb89 100644
--- a/tests/auto/corelib/concurrent/qtconcurrentresultstore/qtconcurrentresultstore.pro
+++ b/tests/auto/corelib/concurrent/qtconcurrentresultstore/qtconcurrentresultstore.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qtconcurrentresultstore
 DEFINES += QT_STRICT_ITERATORS
 SOURCES += tst_qtconcurrentresultstore.cpp
-QT = core core-private
+QT = core core-private testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/concurrent/qtconcurrentrun/qtconcurrentrun.pro b/tests/auto/corelib/concurrent/qtconcurrentrun/qtconcurrentrun.pro
index dfccf06..1914867 100644
--- a/tests/auto/corelib/concurrent/qtconcurrentrun/qtconcurrentrun.pro
+++ b/tests/auto/corelib/concurrent/qtconcurrentrun/qtconcurrentrun.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qtconcurrentrun
 SOURCES += tst_qtconcurrentrun.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/concurrent/qtconcurrentthreadengine/qtconcurrentthreadengine.pro b/tests/auto/corelib/concurrent/qtconcurrentthreadengine/qtconcurrentthreadengine.pro
index d7e2464..f734fc5 100644
--- a/tests/auto/corelib/concurrent/qtconcurrentthreadengine/qtconcurrentthreadengine.pro
+++ b/tests/auto/corelib/concurrent/qtconcurrentthreadengine/qtconcurrentthreadengine.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qtconcurrentthreadengine
 SOURCES += tst_qtconcurrentthreadengine.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/concurrent/qthreadpool/qthreadpool.pro b/tests/auto/corelib/concurrent/qthreadpool/qthreadpool.pro
index dbaeb20..df13d5f 100644
--- a/tests/auto/corelib/concurrent/qthreadpool/qthreadpool.pro
+++ b/tests/auto/corelib/concurrent/qthreadpool/qthreadpool.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qthreadpool
 SOURCES += tst_qthreadpool.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
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 64f08d4..d657fd8 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,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_q_func_info
 SOURCES  += tst_q_func_info.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/global/qflags/qflags.pro b/tests/auto/corelib/global/qflags/qflags.pro
index 097a218..eeb204f 100644
--- a/tests/auto/corelib/global/qflags/qflags.pro
+++ b/tests/auto/corelib/global/qflags/qflags.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qflags
 SOURCES += tst_qflags.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/global/qgetputenv/qgetputenv.pro b/tests/auto/corelib/global/qgetputenv/qgetputenv.pro
index df94f14..ccfac7b 100644
--- a/tests/auto/corelib/global/qgetputenv/qgetputenv.pro
+++ b/tests/auto/corelib/global/qgetputenv/qgetputenv.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qgetputenv
 SOURCES  += tst_qgetputenv.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/global/qglobal/qglobal.pro b/tests/auto/corelib/global/qglobal/qglobal.pro
index a4dffac..b4bcf05 100644
--- a/tests/auto/corelib/global/qglobal/qglobal.pro
+++ b/tests/auto/corelib/global/qglobal/qglobal.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qglobal
 SOURCES += tst_qglobal.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/global/qnumeric/qnumeric.pro b/tests/auto/corelib/global/qnumeric/qnumeric.pro
index c0af962..67b7a8d 100644
--- a/tests/auto/corelib/global/qnumeric/qnumeric.pro
+++ b/tests/auto/corelib/global/qnumeric/qnumeric.pro
@@ -1,7 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qnumeric
 
-QT = core
+QT = core testlib
 
 SOURCES += tst_qnumeric.cpp
-QT = core
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/global/qrand/qrand.pro b/tests/auto/corelib/global/qrand/qrand.pro
index 0db8af8..552592e 100644
--- a/tests/auto/corelib/global/qrand/qrand.pro
+++ b/tests/auto/corelib/global/qrand/qrand.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qrand
 SOURCES += tst_qrand.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/io/qabstractfileengine/qabstractfileengine.pro b/tests/auto/corelib/io/qabstractfileengine/qabstractfileengine.pro
index 870473a..d498b53 100644
--- a/tests/auto/corelib/io/qabstractfileengine/qabstractfileengine.pro
+++ b/tests/auto/corelib/io/qabstractfileengine/qabstractfileengine.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT = core
+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 b768eb8..9745fcd 100644
--- a/tests/auto/corelib/io/qbuffer/qbuffer.pro
+++ b/tests/auto/corelib/io/qbuffer/qbuffer.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qbuffer
 SOURCES  += tst_qbuffer.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/io/qdatastream/qdatastream.pro b/tests/auto/corelib/io/qdatastream/qdatastream.pro
index 5d80b4f..2cb4282 100644
--- a/tests/auto/corelib/io/qdatastream/qdatastream.pro
+++ b/tests/auto/corelib/io/qdatastream/qdatastream.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qdatastream
 SOURCES += tst_qdatastream.cpp
-QT += gui widgets
+QT += gui widgets testlib
 wince*: {
    addFiles.files = datastream.q42
    addFiles.path = .
diff --git a/tests/auto/corelib/io/qdebug/qdebug.pro b/tests/auto/corelib/io/qdebug/qdebug.pro
index 2b57168..b6a91a7 100644
--- a/tests/auto/corelib/io/qdebug/qdebug.pro
+++ b/tests/auto/corelib/io/qdebug/qdebug.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qdebug
 SOURCES += tst_qdebug.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/io/qdir/qdir.pro b/tests/auto/corelib/io/qdir/qdir.pro
index 3f63978..44cf644 100644
--- a/tests/auto/corelib/io/qdir/qdir.pro
+++ b/tests/auto/corelib/io/qdir/qdir.pro
@@ -1,7 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qdir
 SOURCES   += tst_qdir.cpp
 RESOURCES += qdir.qrc
-QT        = core
+QT        = core testlib
 
 wince* {
   DirFiles.files = testdir testData searchdir resources entrylist types tst_qdir.cpp
diff --git a/tests/auto/corelib/io/qdiriterator/qdiriterator.pro b/tests/auto/corelib/io/qdiriterator/qdiriterator.pro
index f9f5c8d..ec9065b 100644
--- a/tests/auto/corelib/io/qdiriterator/qdiriterator.pro
+++ b/tests/auto/corelib/io/qdiriterator/qdiriterator.pro
@@ -1,7 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qdiriterator
 SOURCES  += tst_qdiriterator.cpp
 RESOURCES      += qdiriterator.qrc
-QT = core
+QT = core testlib
 
 wince*mips*|wincewm50smart-msvc200*: DEFINES += WINCE_BROKEN_ITERATE=1
 
diff --git a/tests/auto/corelib/io/qfile/largefile/largefile.pro b/tests/auto/corelib/io/qfile/largefile/largefile.pro
index 7786bdb..5b5cf49 100644
--- a/tests/auto/corelib/io/qfile/largefile/largefile.pro
+++ b/tests/auto/corelib/io/qfile/largefile/largefile.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_largefile
 
-QT = core
+QT = core testlib
 SOURCES += tst_largefile.cpp
 
 wince*: SOURCES += $$QT_SOURCE_TREE/src/corelib/kernel/qfunctions_wince.cpp
diff --git a/tests/auto/corelib/io/qfile/test/test.pro b/tests/auto/corelib/io/qfile/test/test.pro
index 366432c..44dd20c 100644
--- a/tests/auto/corelib/io/qfile/test/test.pro
+++ b/tests/auto/corelib/io/qfile/test/test.pro
@@ -1,8 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
 SOURCES  += ../tst_qfile.cpp
 
 wince* {
-    QT = core gui
+    QT = core gui testlib
     files.files += ..\\dosfile.txt ..\\noendofline.txt ..\\testfile.txt \
                      ..\\testlog.txt ..\\two.dots.file ..\\tst_qfile.cpp \
                      ..\\Makefile ..\\forCopying.txt ..\\forRenaming.txt
@@ -17,7 +17,7 @@ wince* {
     SOURCES += $$QT_SOURCE_TREE/src/corelib/kernel/qfunctions_wince.cpp     # needed for QT_OPEN
     DEFINES += SRCDIR=\\\"\\\"
 } else {
-    QT = core network
+    QT = core network testlib
     DEFINES += SRCDIR=\\\"$$PWD/../\\\"
 }
 
diff --git a/tests/auto/corelib/io/qfileinfo/qfileinfo.pro b/tests/auto/corelib/io/qfileinfo/qfileinfo.pro
index c3b9f4c..42a045d 100644
--- a/tests/auto/corelib/io/qfileinfo/qfileinfo.pro
+++ b/tests/auto/corelib/io/qfileinfo/qfileinfo.pro
@@ -1,7 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qfileinfo
 SOURCES  += tst_qfileinfo.cpp
 
-QT = core-private
+QT = core-private testlib
 
 
 RESOURCES      += qfileinfo.qrc
diff --git a/tests/auto/corelib/io/qfilesystementry/qfilesystementry.pro b/tests/auto/corelib/io/qfilesystementry/qfilesystementry.pro
index 992c90c..7990bb6 100644
--- a/tests/auto/corelib/io/qfilesystementry/qfilesystementry.pro
+++ b/tests/auto/corelib/io/qfilesystementry/qfilesystementry.pro
@@ -1,8 +1,9 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qfilesystementry
 
 SOURCES   += tst_qfilesystementry.cpp \
     $${QT.core.sources}/io/qfilesystementry.cpp
 HEADERS += $${QT.core.sources}/io/qfilesystementry_p.h
-QT = core core-private
+QT = core core-private testlib
 
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/io/qfilesystemwatcher/qfilesystemwatcher.pro b/tests/auto/corelib/io/qfilesystemwatcher/qfilesystemwatcher.pro
index d3549b2..b7ba6d2 100644
--- a/tests/auto/corelib/io/qfilesystemwatcher/qfilesystemwatcher.pro
+++ b/tests/auto/corelib/io/qfilesystemwatcher/qfilesystemwatcher.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qfilesystemwatcher
 SOURCES += tst_qfilesystemwatcher.cpp
-QT = core
+QT = core testlib
 
 CONFIG += parallel_test
 CONFIG += insignificant_test
diff --git a/tests/auto/corelib/io/qiodevice/qiodevice.pro b/tests/auto/corelib/io/qiodevice/qiodevice.pro
index 0d580b8..7ef227d 100644
--- a/tests/auto/corelib/io/qiodevice/qiodevice.pro
+++ b/tests/auto/corelib/io/qiodevice/qiodevice.pro
@@ -1,7 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qiodevice
 SOURCES  += tst_qiodevice.cpp
 
-QT = core network
+QT = core network testlib
 
 wince*: {
    addFiles.files = tst_qiodevice.cpp
diff --git a/tests/auto/corelib/io/qprocess/test/test.pro b/tests/auto/corelib/io/qprocess/test/test.pro
index 5581077..3bac7ea 100644
--- a/tests/auto/corelib/io/qprocess/test/test.pro
+++ b/tests/auto/corelib/io/qprocess/test/test.pro
@@ -1,4 +1,4 @@
-load(qttest_p4)
+CONFIG += testcase
 
 SOURCES += ../tst_qprocess.cpp
 !wince*: {
@@ -17,7 +17,7 @@ win32: {
 
 
 
-QT = core
+QT = core testlib
 QT += network
 
 embedded: QT += gui
diff --git a/tests/auto/corelib/io/qprocessenvironment/qprocessenvironment.pro b/tests/auto/corelib/io/qprocessenvironment/qprocessenvironment.pro
index 60dba50..b05b8a5 100644
--- a/tests/auto/corelib/io/qprocessenvironment/qprocessenvironment.pro
+++ b/tests/auto/corelib/io/qprocessenvironment/qprocessenvironment.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qprocessenvironment
 
-QT = core
+QT = core testlib
 
 SOURCES  += tst_qprocessenvironment.cpp
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/io/qresourceengine/qresourceengine.pro b/tests/auto/corelib/io/qresourceengine/qresourceengine.pro
index 09509ec..e8c6f36 100644
--- a/tests/auto/corelib/io/qresourceengine/qresourceengine.pro
+++ b/tests/auto/corelib/io/qresourceengine/qresourceengine.pro
@@ -2,7 +2,7 @@
 # Automatically generated by qmake (2.00a) ma 2. mai 16:14:33 2005
 ######################################################################
 
-load(qttest_p4)
+CONFIG += testcase
 load(resources)
 
 # Input
@@ -15,7 +15,7 @@ runtime_resource.commands = $$QMAKE_RCC -root /runtime_resource/ -binary $${runt
 QMAKE_EXTRA_TARGETS = runtime_resource
 PRE_TARGETDEPS += $${runtime_resource.target}
 
-QT = core
+QT = core testlib
 wince* {
     deploy.files += runtime_resource.rcc parentdir.txt
     test.files = testqrc/*
diff --git a/tests/auto/corelib/io/qsettings/qsettings.pro b/tests/auto/corelib/io/qsettings/qsettings.pro
index f15e40b..ac85ea8 100644
--- a/tests/auto/corelib/io/qsettings/qsettings.pro
+++ b/tests/auto/corelib/io/qsettings/qsettings.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qsettings
 
-QT += core-private
+QT += core-private testlib
 
 SOURCES  += tst_qsettings.cpp
 RESOURCES += qsettings.qrc
diff --git a/tests/auto/corelib/io/qtemporaryfile/qtemporaryfile.pro b/tests/auto/corelib/io/qtemporaryfile/qtemporaryfile.pro
index dda224c..0c43b9c 100644
--- a/tests/auto/corelib/io/qtemporaryfile/qtemporaryfile.pro
+++ b/tests/auto/corelib/io/qtemporaryfile/qtemporaryfile.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qtemporaryfile
 SOURCES       += tst_qtemporaryfile.cpp
-QT = core
+QT = core testlib
 
 DEFINES += SRCDIR=\\\"$$PWD/\\\"
 
diff --git a/tests/auto/corelib/io/qtextstream/test/test.pro b/tests/auto/corelib/io/qtextstream/test/test.pro
index 79252b2..8a0c9d4 100644
--- a/tests/auto/corelib/io/qtextstream/test/test.pro
+++ b/tests/auto/corelib/io/qtextstream/test/test.pro
@@ -1,4 +1,4 @@
-load(qttest_p4)
+CONFIG += testcase
 SOURCES  += ../tst_qtextstream.cpp
 
 TARGET = ../tst_qtextstream
@@ -13,7 +13,7 @@ win32 {
 
 RESOURCES += ../qtextstream.qrc
 
-QT = core network
+QT = core network testlib
 
 wince* {
     addFiles.files = ../rfc3261.txt ../shift-jis.txt ../task113817.txt ../qtextstream.qrc ../tst_qtextstream.cpp
diff --git a/tests/auto/corelib/io/qurl/qurl.pro b/tests/auto/corelib/io/qurl/qurl.pro
index e6976e3..99aeb56 100644
--- a/tests/auto/corelib/io/qurl/qurl.pro
+++ b/tests/auto/corelib/io/qurl/qurl.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qurl
 SOURCES  += tst_qurl.cpp
-QT = core core-private
+QT = core core-private testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro b/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro
index eee2222..b3551da 100644
--- a/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro
+++ b/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro
@@ -1,7 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qabstractitemmodel
 
 mtdir = ../../../integrationtests/modeltest
 INCLUDEPATH += $$PWD/$${mtdir}
-QT += widgets
+QT += widgets testlib
 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 031af39..33ac65d 100644
--- a/tests/auto/corelib/kernel/qcoreapplication/qcoreapplication.pro
+++ b/tests/auto/corelib/kernel/qcoreapplication/qcoreapplication.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qcoreapplication
 SOURCES += tst_qcoreapplication.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/kernel/qeventloop/qeventloop.pro b/tests/auto/corelib/kernel/qeventloop/qeventloop.pro
index e8f6bba..822878e 100644
--- a/tests/auto/corelib/kernel/qeventloop/qeventloop.pro
+++ b/tests/auto/corelib/kernel/qeventloop/qeventloop.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qeventloop
 SOURCES += tst_qeventloop.cpp
 QT -= gui 
-QT += network
+QT += network testlib
 
 win32:!wince*:LIBS += -luser32
diff --git a/tests/auto/corelib/kernel/qitemmodel/qitemmodel.pro b/tests/auto/corelib/kernel/qitemmodel/qitemmodel.pro
index c44fa5a..f02b149 100644
--- a/tests/auto/corelib/kernel/qitemmodel/qitemmodel.pro
+++ b/tests/auto/corelib/kernel/qitemmodel/qitemmodel.pro
@@ -1,7 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qitemmodel
 SOURCES         += tst_qitemmodel.cpp
 
-QT += widgets sql
+QT += widgets sql testlib
 
 # 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 e5784ce..90e61d7 100644
--- a/tests/auto/corelib/kernel/qmath/qmath.pro
+++ b/tests/auto/corelib/kernel/qmath/qmath.pro
@@ -1,7 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qmath
 
-QT = core
+QT = core testlib
 
 SOURCES += tst_qmath.cpp
-QT = core
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/kernel/qmetaobject/qmetaobject.pro b/tests/auto/corelib/kernel/qmetaobject/qmetaobject.pro
index 7a4cf94..d5fc3d2 100644
--- a/tests/auto/corelib/kernel/qmetaobject/qmetaobject.pro
+++ b/tests/auto/corelib/kernel/qmetaobject/qmetaobject.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qmetaobject
 
-QT = core gui widgets
+QT = core gui widgets testlib
 
 SOURCES  += tst_qmetaobject.cpp
 
diff --git a/tests/auto/corelib/kernel/qmetaproperty/qmetaproperty.pro b/tests/auto/corelib/kernel/qmetaproperty/qmetaproperty.pro
index 4369f33..4ceb253 100644
--- a/tests/auto/corelib/kernel/qmetaproperty/qmetaproperty.pro
+++ b/tests/auto/corelib/kernel/qmetaproperty/qmetaproperty.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
-QT = core gui
+CONFIG += testcase
+TARGET = tst_qmetaproperty
+QT = core gui testlib
 SOURCES  += tst_qmetaproperty.cpp
 
diff --git a/tests/auto/corelib/kernel/qmetatype/qmetatype.pro b/tests/auto/corelib/kernel/qmetatype/qmetatype.pro
index ed1de83..2841c5f 100644
--- a/tests/auto/corelib/kernel/qmetatype/qmetatype.pro
+++ b/tests/auto/corelib/kernel/qmetatype/qmetatype.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qmetatype
 SOURCES  += tst_qmetatype.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/kernel/qmimedata/qmimedata.pro b/tests/auto/corelib/kernel/qmimedata/qmimedata.pro
index 13fbe65..e4cf4ce 100644
--- a/tests/auto/corelib/kernel/qmimedata/qmimedata.pro
+++ b/tests/auto/corelib/kernel/qmimedata/qmimedata.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qmimedata
 SOURCES  += tst_qmimedata.cpp
-
+QT += testlib
 
diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.pro b/tests/auto/corelib/kernel/qobject/tst_qobject.pro
index aac6bdc..b52e25b 100644
--- a/tests/auto/corelib/kernel/qobject/tst_qobject.pro
+++ b/tests/auto/corelib/kernel/qobject/tst_qobject.pro
@@ -1,14 +1,15 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qobject
 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 \
+QT = core-private \
     network \
     gui \
-    core-private
+    testlib
 wince*: { 
     addFiles.files = signalbug.exe
     addFiles.path = .
diff --git a/tests/auto/corelib/kernel/qpointer/qpointer.pro b/tests/auto/corelib/kernel/qpointer/qpointer.pro
index 5728b7b..33a31eb 100644
--- a/tests/auto/corelib/kernel/qpointer/qpointer.pro
+++ b/tests/auto/corelib/kernel/qpointer/qpointer.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qpointer
+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 5af4b70..4bca1ab 100644
--- a/tests/auto/corelib/kernel/qsignalmapper/qsignalmapper.pro
+++ b/tests/auto/corelib/kernel/qsignalmapper/qsignalmapper.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qsignalmapper
+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 d8d1c3f..a60104c 100644
--- a/tests/auto/corelib/kernel/qsocketnotifier/qsocketnotifier.pro
+++ b/tests/auto/corelib/kernel/qsocketnotifier/qsocketnotifier.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qsocketnotifier
 SOURCES += tst_qsocketnotifier.cpp
-QT = core-private network-private
+QT = core-private network-private testlib
 
 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 086df1d..1b24228 100644
--- a/tests/auto/corelib/kernel/qtimer/qtimer.pro
+++ b/tests/auto/corelib/kernel/qtimer/qtimer.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-QT = core
+CONFIG += testcase
+TARGET = tst_qtimer
+QT = core testlib
 SOURCES  += tst_qtimer.cpp
-QT = core
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/kernel/qtipc/qsharedmemory/test/test.pro b/tests/auto/corelib/kernel/qtipc/qsharedmemory/test/test.pro
index c384e15..6893c58 100644
--- a/tests/auto/corelib/kernel/qtipc/qsharedmemory/test/test.pro
+++ b/tests/auto/corelib/kernel/qtipc/qsharedmemory/test/test.pro
@@ -1,7 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
 
 include(../src/src.pri)
-QT -= gui
+QT = core testlib
 
 DEFINES	+= QSHAREDMEMORY_DEBUG
 DEFINES	+= QSYSTEMSEMAPHORE_DEBUG
diff --git a/tests/auto/corelib/kernel/qtipc/qsystemsemaphore/qsystemsemaphore.pro b/tests/auto/corelib/kernel/qtipc/qsystemsemaphore/qsystemsemaphore.pro
index c687e2d..3c1cf75 100644
--- a/tests/auto/corelib/kernel/qtipc/qsystemsemaphore/qsystemsemaphore.pro
+++ b/tests/auto/corelib/kernel/qtipc/qsystemsemaphore/qsystemsemaphore.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-#QT = core
+CONFIG += testcase
+QT += testlib
 
 include(../qsharedmemory/src/src.pri)
 win32: CONFIG += console
diff --git a/tests/auto/corelib/kernel/qtranslator/qtranslator.pro b/tests/auto/corelib/kernel/qtranslator/qtranslator.pro
index 4e3f305..0582499 100644
--- a/tests/auto/corelib/kernel/qtranslator/qtranslator.pro
+++ b/tests/auto/corelib/kernel/qtranslator/qtranslator.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qtranslator
+QT += widgets testlib
 SOURCES  += tst_qtranslator.cpp
 RESOURCES += qtranslator.qrc
 
diff --git a/tests/auto/corelib/kernel/qvariant/qvariant.pro b/tests/auto/corelib/kernel/qvariant/qvariant.pro
index 0fed3d8..e81e4d7 100644
--- a/tests/auto/corelib/kernel/qvariant/qvariant.pro
+++ b/tests/auto/corelib/kernel/qvariant/qvariant.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qvariant
 SOURCES  += tst_qvariant.cpp
-QT += widgets network
+QT += widgets network testlib
 
 CONFIG+=insignificant_test # See QTBUG-8959
diff --git a/tests/auto/corelib/kernel/qwineventnotifier/qwineventnotifier.pro b/tests/auto/corelib/kernel/qwineventnotifier/qwineventnotifier.pro
index 4a5ea78..296aab3 100644
--- a/tests/auto/corelib/kernel/qwineventnotifier/qwineventnotifier.pro
+++ b/tests/auto/corelib/kernel/qwineventnotifier/qwineventnotifier.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qwineventnotifier
 SOURCES  += tst_qwineventnotifier.cpp
-QT = core core-private
+QT = core core-private testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/plugin/qlibrary/tst/tst.pro b/tests/auto/corelib/plugin/qlibrary/tst/tst.pro
index 76fd196..c5035a8 100644
--- a/tests/auto/corelib/plugin/qlibrary/tst/tst.pro
+++ b/tests/auto/corelib/plugin/qlibrary/tst/tst.pro
@@ -1,7 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
 SOURCES         += ../tst_qlibrary.cpp
 TARGET  = ../tst_qlibrary
-QT = core
+QT = core testlib
 
 win32 {
   CONFIG(debug, debug|release) {
diff --git a/tests/auto/corelib/plugin/qplugin/tst_qplugin.pro b/tests/auto/corelib/plugin/qplugin/tst_qplugin.pro
index 527c26a..894be1c 100644
--- a/tests/auto/corelib/plugin/qplugin/tst_qplugin.pro
+++ b/tests/auto/corelib/plugin/qplugin/tst_qplugin.pro
@@ -1,7 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qplugin
 
 SOURCES = tst_qplugin.cpp
-QT = core
+QT = core testlib
 
 wince*: {
    plugins.files = plugins/*
diff --git a/tests/auto/corelib/plugin/qpluginloader/tst/tst.pro b/tests/auto/corelib/plugin/qpluginloader/tst/tst.pro
index 671b3f3..4a11bf4 100644
--- a/tests/auto/corelib/plugin/qpluginloader/tst/tst.pro
+++ b/tests/auto/corelib/plugin/qpluginloader/tst/tst.pro
@@ -1,7 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
 SOURCES         += ../tst_qpluginloader.cpp
 TARGET  = ../tst_qpluginloader
-QT = core
+QT = core testlib
 HEADERS += ../theplugin/plugininterface.h
 
 win32 {
diff --git a/tests/auto/corelib/plugin/quuid/test/test.pro b/tests/auto/corelib/plugin/quuid/test/test.pro
index dd8de74..0063493 100644
--- a/tests/auto/corelib/plugin/quuid/test/test.pro
+++ b/tests/auto/corelib/plugin/quuid/test/test.pro
@@ -1,6 +1,6 @@
-load(qttest_p4)
+CONFIG += testcase
 
-QT = core
+QT = core testlib
 SOURCES += ../tst_quuid.cpp
 TARGET = tst_quuid
 
diff --git a/tests/auto/corelib/statemachine/qstate/qstate.pro b/tests/auto/corelib/statemachine/qstate/qstate.pro
index 6ee7e0c..243a696 100644
--- a/tests/auto/corelib/statemachine/qstate/qstate.pro
+++ b/tests/auto/corelib/statemachine/qstate/qstate.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT = core
+CONFIG += testcase
+TARGET = tst_qstate
+QT = core testlib
 SOURCES  += tst_qstate.cpp
 
 
diff --git a/tests/auto/corelib/statemachine/qstatemachine/qstatemachine.pro b/tests/auto/corelib/statemachine/qstatemachine/qstatemachine.pro
index 9d057eb..1997e21 100644
--- a/tests/auto/corelib/statemachine/qstatemachine/qstatemachine.pro
+++ b/tests/auto/corelib/statemachine/qstatemachine/qstatemachine.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qstatemachine
+QT += widgets testlib
 QT += core core-private 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 7850d93..dd18c7d 100644
--- a/tests/auto/corelib/thread/qatomicint/qatomicint.pro
+++ b/tests/auto/corelib/thread/qatomicint/qatomicint.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qatomicint
 SOURCES += tst_qatomicint.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/thread/qatomicpointer/qatomicpointer.pro b/tests/auto/corelib/thread/qatomicpointer/qatomicpointer.pro
index 89ff137..dc6c54a 100644
--- a/tests/auto/corelib/thread/qatomicpointer/qatomicpointer.pro
+++ b/tests/auto/corelib/thread/qatomicpointer/qatomicpointer.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qatomicpointer
 SOURCES += tst_qatomicpointer.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/thread/qmutex/qmutex.pro b/tests/auto/corelib/thread/qmutex/qmutex.pro
index 760dcfd..cf567c2 100644
--- a/tests/auto/corelib/thread/qmutex/qmutex.pro
+++ b/tests/auto/corelib/thread/qmutex/qmutex.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qmutex
 SOURCES += tst_qmutex.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/thread/qmutexlocker/qmutexlocker.pro b/tests/auto/corelib/thread/qmutexlocker/qmutexlocker.pro
index 01c3691..9e44b5f 100644
--- a/tests/auto/corelib/thread/qmutexlocker/qmutexlocker.pro
+++ b/tests/auto/corelib/thread/qmutexlocker/qmutexlocker.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qmutexlocker
 SOURCES += tst_qmutexlocker.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/thread/qreadlocker/qreadlocker.pro b/tests/auto/corelib/thread/qreadlocker/qreadlocker.pro
index ee53307..13cdf0c 100644
--- a/tests/auto/corelib/thread/qreadlocker/qreadlocker.pro
+++ b/tests/auto/corelib/thread/qreadlocker/qreadlocker.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qreadlocker
 SOURCES += tst_qreadlocker.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/thread/qreadwritelock/qreadwritelock.pro b/tests/auto/corelib/thread/qreadwritelock/qreadwritelock.pro
index 93f7c68..c35023d 100644
--- a/tests/auto/corelib/thread/qreadwritelock/qreadwritelock.pro
+++ b/tests/auto/corelib/thread/qreadwritelock/qreadwritelock.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qreadwritelock
 SOURCES += tst_qreadwritelock.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/thread/qsemaphore/qsemaphore.pro b/tests/auto/corelib/thread/qsemaphore/qsemaphore.pro
index a75bf44..871bd97 100644
--- a/tests/auto/corelib/thread/qsemaphore/qsemaphore.pro
+++ b/tests/auto/corelib/thread/qsemaphore/qsemaphore.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qsemaphore
 SOURCES  += tst_qsemaphore.cpp
-QT = core
+QT = core testlib
 
 
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/thread/qthread/qthread.pro b/tests/auto/corelib/thread/qthread/qthread.pro
index ae11d71..da3be3b 100644
--- a/tests/auto/corelib/thread/qthread/qthread.pro
+++ b/tests/auto/corelib/thread/qthread/qthread.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qthread
 SOURCES += tst_qthread.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/thread/qthreadonce/qthreadonce.pro b/tests/auto/corelib/thread/qthreadonce/qthreadonce.pro
index d7ef4d4..cd97917 100644
--- a/tests/auto/corelib/thread/qthreadonce/qthreadonce.pro
+++ b/tests/auto/corelib/thread/qthreadonce/qthreadonce.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qthreadonce
 SOURCES += tst_qthreadonce.cpp
-QT = core
+QT = core testlib
 
 # Don't use gcc's threadsafe statics
 # Note: some versions of gcc generate invalid code with this option...
diff --git a/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.pro b/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.pro
index ae03169..64f1767 100644
--- a/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.pro
+++ b/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.pro
@@ -1,3 +1,4 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qthreadstorage
 SOURCES += tst_qthreadstorage.cpp
-QT = core
+QT = core testlib
diff --git a/tests/auto/corelib/thread/qwaitcondition/qwaitcondition.pro b/tests/auto/corelib/thread/qwaitcondition/qwaitcondition.pro
index 9af0c71..b9cf3af 100644
--- a/tests/auto/corelib/thread/qwaitcondition/qwaitcondition.pro
+++ b/tests/auto/corelib/thread/qwaitcondition/qwaitcondition.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qwaitcondition
 SOURCES += tst_qwaitcondition.cpp
-QT = core
+QT = core testlib
 
 
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/thread/qwritelocker/qwritelocker.pro b/tests/auto/corelib/thread/qwritelocker/qwritelocker.pro
index 39a98aa..946e75c 100644
--- a/tests/auto/corelib/thread/qwritelocker/qwritelocker.pro
+++ b/tests/auto/corelib/thread/qwritelocker/qwritelocker.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qwritelocker
 SOURCES += tst_qwritelocker.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qalgorithms/qalgorithms.pro b/tests/auto/corelib/tools/qalgorithms/qalgorithms.pro
index 9143da6..0827174 100644
--- a/tests/auto/corelib/tools/qalgorithms/qalgorithms.pro
+++ b/tests/auto/corelib/tools/qalgorithms/qalgorithms.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qalgorithms
 SOURCES  += tst_qalgorithms.cpp
 
-QT = core
+QT = core testlib
diff --git a/tests/auto/corelib/tools/qbitarray/qbitarray.pro b/tests/auto/corelib/tools/qbitarray/qbitarray.pro
index 358d81b..528ea58 100644
--- a/tests/auto/corelib/tools/qbitarray/qbitarray.pro
+++ b/tests/auto/corelib/tools/qbitarray/qbitarray.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qbitarray
 SOURCES  += tst_qbitarray.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qbytearray/qbytearray.pro b/tests/auto/corelib/tools/qbytearray/qbytearray.pro
index d903be2..91a47b2 100644
--- a/tests/auto/corelib/tools/qbytearray/qbytearray.pro
+++ b/tests/auto/corelib/tools/qbytearray/qbytearray.pro
@@ -1,8 +1,9 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qbytearray
 SOURCES  += tst_qbytearray.cpp
 
 
-QT = core core-private
+QT = core core-private testlib
 
 wince* {
    addFile.files = rfc3252.txt
diff --git a/tests/auto/corelib/tools/qbytearraymatcher/qbytearraymatcher.pro b/tests/auto/corelib/tools/qbytearraymatcher/qbytearraymatcher.pro
index a2458e6..a90511d 100644
--- a/tests/auto/corelib/tools/qbytearraymatcher/qbytearraymatcher.pro
+++ b/tests/auto/corelib/tools/qbytearraymatcher/qbytearraymatcher.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qbytearraymatcher
 SOURCES  += tst_qbytearraymatcher.cpp
 
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qcache/qcache.pro b/tests/auto/corelib/tools/qcache/qcache.pro
index 0da4e14..bd2a683 100644
--- a/tests/auto/corelib/tools/qcache/qcache.pro
+++ b/tests/auto/corelib/tools/qcache/qcache.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qcache
 SOURCES  += tst_qcache.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qchar/qchar.pro b/tests/auto/corelib/tools/qchar/qchar.pro
index 57b5642..4921144 100644
--- a/tests/auto/corelib/tools/qchar/qchar.pro
+++ b/tests/auto/corelib/tools/qchar/qchar.pro
@@ -1,7 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qchar
 SOURCES  += tst_qchar.cpp
 
-QT = core core-private
+QT = core core-private testlib
 
 wince*: {
     deploy.files += NormalizationTest.txt
diff --git a/tests/auto/corelib/tools/qcryptographichash/qcryptographichash.pro b/tests/auto/corelib/tools/qcryptographichash/qcryptographichash.pro
index 0192212..4f4d12b 100644
--- a/tests/auto/corelib/tools/qcryptographichash/qcryptographichash.pro
+++ b/tests/auto/corelib/tools/qcryptographichash/qcryptographichash.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qcryptographichash
 SOURCES += tst_qcryptographichash.cpp
-QT = core
+QT = core testlib
 
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qdate/qdate.pro b/tests/auto/corelib/tools/qdate/qdate.pro
index 1c04100..749c65e 100644
--- a/tests/auto/corelib/tools/qdate/qdate.pro
+++ b/tests/auto/corelib/tools/qdate/qdate.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qdate
 SOURCES  += tst_qdate.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qdatetime/qdatetime.pro b/tests/auto/corelib/tools/qdatetime/qdatetime.pro
index cd33582..33c777f 100644
--- a/tests/auto/corelib/tools/qdatetime/qdatetime.pro
+++ b/tests/auto/corelib/tools/qdatetime/qdatetime.pro
@@ -1,7 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qdatetime
 
 SOURCES += tst_qdatetime.cpp
-QT = core core-private
+QT = core core-private testlib
 
 # For some reason using optimization here triggers a compiler issue, which causes an exception
 # However, the code is correct
diff --git a/tests/auto/corelib/tools/qeasingcurve/qeasingcurve.pro b/tests/auto/corelib/tools/qeasingcurve/qeasingcurve.pro
index 2a3a075..03d71bb 100644
--- a/tests/auto/corelib/tools/qeasingcurve/qeasingcurve.pro
+++ b/tests/auto/corelib/tools/qeasingcurve/qeasingcurve.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
-QT = core
+CONFIG += testcase
+TARGET = tst_qeasingcurve
+QT = core testlib
 SOURCES  += tst_qeasingcurve.cpp
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qelapsedtimer/qelapsedtimer.pro b/tests/auto/corelib/tools/qelapsedtimer/qelapsedtimer.pro
index 30714f3..1efacfe 100644
--- a/tests/auto/corelib/tools/qelapsedtimer/qelapsedtimer.pro
+++ b/tests/auto/corelib/tools/qelapsedtimer/qelapsedtimer.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT -= gui
+CONFIG += testcase
+TARGET = tst_qelapsedtimer
+QT = core testlib
 
 SOURCES += tst_qelapsedtimer.cpp
 wince* {
diff --git a/tests/auto/corelib/tools/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro b/tests/auto/corelib/tools/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro
index cf574ff..9064d02 100644
--- a/tests/auto/corelib/tools/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro
+++ b/tests/auto/corelib/tools/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qexplicitlyshareddatapointer
 SOURCES += tst_qexplicitlyshareddatapointer.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qfreelist/qfreelist.pro b/tests/auto/corelib/tools/qfreelist/qfreelist.pro
index 0afa12b..2c3c693 100644
--- a/tests/auto/corelib/tools/qfreelist/qfreelist.pro
+++ b/tests/auto/corelib/tools/qfreelist/qfreelist.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qfreelist
 SOURCES  += tst_qfreelist.cpp
-QT += core-private
+QT += core-private testlib
 QT -= gui
 !contains(QT_CONFIG,private_tests): SOURCES += $$QT.core.sources/tools/qfreelist.cpp
diff --git a/tests/auto/corelib/tools/qhash/qhash.pro b/tests/auto/corelib/tools/qhash/qhash.pro
index 3baa209..171a26e 100644
--- a/tests/auto/corelib/tools/qhash/qhash.pro
+++ b/tests/auto/corelib/tools/qhash/qhash.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qhash
 SOURCES  += tst_qhash.cpp
-QT = core
+QT = core testlib
 
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qline/qline.pro b/tests/auto/corelib/tools/qline/qline.pro
index 9ad7b73..9b413e8 100644
--- a/tests/auto/corelib/tools/qline/qline.pro
+++ b/tests/auto/corelib/tools/qline/qline.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT -= gui
+CONFIG += testcase
+TARGET = tst_qline
+QT = core testlib
 SOURCES += tst_qline.cpp
 unix:!mac:!vxworks:LIBS+=-lm
 
diff --git a/tests/auto/corelib/tools/qlist/qlist.pro b/tests/auto/corelib/tools/qlist/qlist.pro
index 708589e..4ab25d0 100644
--- a/tests/auto/corelib/tools/qlist/qlist.pro
+++ b/tests/auto/corelib/tools/qlist/qlist.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT = core
+CONFIG += testcase
+TARGET = tst_qlist
+QT = core testlib
 SOURCES  += tst_qlist.cpp
 
 
diff --git a/tests/auto/corelib/tools/qlocale/test/test.pro b/tests/auto/corelib/tools/qlocale/test/test.pro
index 8416692..2cfa593 100644
--- a/tests/auto/corelib/tools/qlocale/test/test.pro
+++ b/tests/auto/corelib/tools/qlocale/test/test.pro
@@ -1,4 +1,4 @@
-load(qttest_p4)
+CONFIG += testcase
 SOURCES += ../tst_qlocale.cpp
 
 !wince*: {
@@ -17,7 +17,7 @@ win32: {
 
 
 
-QT = core
+QT = core testlib
 QT += network
 embedded: QT += gui
 
diff --git a/tests/auto/corelib/tools/qmap/qmap.pro b/tests/auto/corelib/tools/qmap/qmap.pro
index eaed926..fc4c84c 100644
--- a/tests/auto/corelib/tools/qmap/qmap.pro
+++ b/tests/auto/corelib/tools/qmap/qmap.pro
@@ -1,7 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qmap
 
-QT = core
+QT = core testlib
 
 SOURCES  += tst_qmap.cpp
-QT = core
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qmargins/qmargins.pro b/tests/auto/corelib/tools/qmargins/qmargins.pro
index 0404da0..02478c3 100644
--- a/tests/auto/corelib/tools/qmargins/qmargins.pro
+++ b/tests/auto/corelib/tools/qmargins/qmargins.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qmargins
 SOURCES += tst_qmargins.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qpoint/qpoint.pro b/tests/auto/corelib/tools/qpoint/qpoint.pro
index fd24046..cd501f6 100644
--- a/tests/auto/corelib/tools/qpoint/qpoint.pro
+++ b/tests/auto/corelib/tools/qpoint/qpoint.pro
@@ -2,7 +2,8 @@
 # Project file for autotest for file qpoint.h
 ############################################################
 
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qpoint
 SOURCES += tst_qpoint.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qqueue/qqueue.pro b/tests/auto/corelib/tools/qqueue/qqueue.pro
index ce0d8c3..4a515d7 100644
--- a/tests/auto/corelib/tools/qqueue/qqueue.pro
+++ b/tests/auto/corelib/tools/qqueue/qqueue.pro
@@ -1,7 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qqueue
 
-QT = core
+QT = core testlib
 
 SOURCES += tst_qqueue.cpp
-QT = core
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qrect/qrect.pro b/tests/auto/corelib/tools/qrect/qrect.pro
index f1ad046..149d194 100644
--- a/tests/auto/corelib/tools/qrect/qrect.pro
+++ b/tests/auto/corelib/tools/qrect/qrect.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qrect
 SOURCES  += tst_qrect.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qregexp/qregexp.pro b/tests/auto/corelib/tools/qregexp/qregexp.pro
index e0fef12..9630235 100644
--- a/tests/auto/corelib/tools/qregexp/qregexp.pro
+++ b/tests/auto/corelib/tools/qregexp/qregexp.pro
@@ -1,9 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qregexp
 
-QT = core
-
-
-QT = core
+QT = core testlib
 
 SOURCES  += tst_qregexp.cpp
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qringbuffer/qringbuffer.pro b/tests/auto/corelib/tools/qringbuffer/qringbuffer.pro
index dc572d0..2f595ec 100644
--- a/tests/auto/corelib/tools/qringbuffer/qringbuffer.pro
+++ b/tests/auto/corelib/tools/qringbuffer/qringbuffer.pro
@@ -1,7 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qringbuffer
 SOURCES  += tst_qringbuffer.cpp
 
-QT = core core-private
+QT = core core-private testlib
 
 
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qscopedpointer/qscopedpointer.pro b/tests/auto/corelib/tools/qscopedpointer/qscopedpointer.pro
index 4a3d5b8..1aa5e33 100644
--- a/tests/auto/corelib/tools/qscopedpointer/qscopedpointer.pro
+++ b/tests/auto/corelib/tools/qscopedpointer/qscopedpointer.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qscopedpointer
 SOURCES += tst_qscopedpointer.cpp
-QT -= gui
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qscopedvaluerollback/qscopedvaluerollback.pro b/tests/auto/corelib/tools/qscopedvaluerollback/qscopedvaluerollback.pro
index f06e21b..85aab77 100644
--- a/tests/auto/corelib/tools/qscopedvaluerollback/qscopedvaluerollback.pro
+++ b/tests/auto/corelib/tools/qscopedvaluerollback/qscopedvaluerollback.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qscopedvaluerollback
 SOURCES += tst_qscopedvaluerollback.cpp
-QT -= gui
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qset/qset.pro b/tests/auto/corelib/tools/qset/qset.pro
index 4efc6c7..0e456c6 100644
--- a/tests/auto/corelib/tools/qset/qset.pro
+++ b/tests/auto/corelib/tools/qset/qset.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qset
 SOURCES  += tst_qset.cpp
-QT = core
+QT = core testlib
 
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qsharedpointer/qsharedpointer.pro b/tests/auto/corelib/tools/qsharedpointer/qsharedpointer.pro
index 5a941f6..2e822f6 100644
--- a/tests/auto/corelib/tools/qsharedpointer/qsharedpointer.pro
+++ b/tests/auto/corelib/tools/qsharedpointer/qsharedpointer.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qsharedpointer
 
 SOURCES += tst_qsharedpointer.cpp \
     forwarddeclaration.cpp \
@@ -8,7 +9,7 @@ SOURCES += tst_qsharedpointer.cpp \
 HEADERS += forwarddeclared.h \
     wrapper.h
 
-QT = core
+QT = core testlib
 DEFINES += SRCDIR=\\\"$$PWD/\\\"
 
 include(externaltests.pri)
diff --git a/tests/auto/corelib/tools/qsize/qsize.pro b/tests/auto/corelib/tools/qsize/qsize.pro
index a1814ac..140205b 100644
--- a/tests/auto/corelib/tools/qsize/qsize.pro
+++ b/tests/auto/corelib/tools/qsize/qsize.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qsize
 SOURCES += tst_qsize.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qsizef/qsizef.pro b/tests/auto/corelib/tools/qsizef/qsizef.pro
index 5aa07d7..e0e9b0d 100644
--- a/tests/auto/corelib/tools/qsizef/qsizef.pro
+++ b/tests/auto/corelib/tools/qsizef/qsizef.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qsizef
 SOURCES += tst_qsizef.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qstl/qstl.pro b/tests/auto/corelib/tools/qstl/qstl.pro
index a0c9db1..128ee56 100644
--- a/tests/auto/corelib/tools/qstl/qstl.pro
+++ b/tests/auto/corelib/tools/qstl/qstl.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qstl
 SOURCES += tst_qstl.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qstring/qstring.pro b/tests/auto/corelib/tools/qstring/qstring.pro
index cdf2852..4515c32 100644
--- a/tests/auto/corelib/tools/qstring/qstring.pro
+++ b/tests/auto/corelib/tools/qstring/qstring.pro
@@ -1,7 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qstring
 SOURCES  += tst_qstring.cpp
 
-QT = core
+QT = core testlib
 
 DEFINES += QT_NO_CAST_TO_ASCII
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/qstringbuilder1.pro b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/qstringbuilder1.pro
index dc9062f..1888450 100644
--- a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/qstringbuilder1.pro
+++ b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/qstringbuilder1.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qstringbuilder1
 
-QT = core
+QT = core testlib
 
 SOURCES  += tst_qstringbuilder1.cpp
 
diff --git a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder2/qstringbuilder2.pro b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder2/qstringbuilder2.pro
index a57c6f1..8a1554d 100644
--- a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder2/qstringbuilder2.pro
+++ b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder2/qstringbuilder2.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qstringbuilder2
 
-QT = core
+QT = core testlib
 
 SOURCES  += tst_qstringbuilder2.cpp
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder3/qstringbuilder3.pro b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder3/qstringbuilder3.pro
index 5aced7c..00e64ee 100644
--- a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder3/qstringbuilder3.pro
+++ b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder3/qstringbuilder3.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qstringbuilder3
 
-QT = core
+QT = core testlib
 
 SOURCES  += tst_qstringbuilder3.cpp
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder4/qstringbuilder4.pro b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder4/qstringbuilder4.pro
index 0532a9b..ef7893c 100644
--- a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder4/qstringbuilder4.pro
+++ b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder4/qstringbuilder4.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qstringbuilder4
 
-QT = core
+QT = core testlib
 
 SOURCES  += tst_qstringbuilder4.cpp
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qstringlist/qstringlist.pro b/tests/auto/corelib/tools/qstringlist/qstringlist.pro
index d82a348..73b8559 100644
--- a/tests/auto/corelib/tools/qstringlist/qstringlist.pro
+++ b/tests/auto/corelib/tools/qstringlist/qstringlist.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qstringlist
 SOURCES  += tst_qstringlist.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qstringmatcher/qstringmatcher.pro b/tests/auto/corelib/tools/qstringmatcher/qstringmatcher.pro
index c5249ec..0599163 100644
--- a/tests/auto/corelib/tools/qstringmatcher/qstringmatcher.pro
+++ b/tests/auto/corelib/tools/qstringmatcher/qstringmatcher.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qstringmatcher
 SOURCES  += tst_qstringmatcher.cpp
-QT = core
+QT = core testlib
 DEFINES += QT_NO_CAST_TO_ASCII
 
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qstringref/qstringref.pro b/tests/auto/corelib/tools/qstringref/qstringref.pro
index 34f2de4..7aa5f38 100644
--- a/tests/auto/corelib/tools/qstringref/qstringref.pro
+++ b/tests/auto/corelib/tools/qstringref/qstringref.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qstringref
 SOURCES  += tst_qstringref.cpp
 
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qtextboundaryfinder/qtextboundaryfinder.pro b/tests/auto/corelib/tools/qtextboundaryfinder/qtextboundaryfinder.pro
index 244f9d2..5d50d2c 100644
--- a/tests/auto/corelib/tools/qtextboundaryfinder/qtextboundaryfinder.pro
+++ b/tests/auto/corelib/tools/qtextboundaryfinder/qtextboundaryfinder.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT = core
+CONFIG += testcase
+TARGET = tst_qtextboundaryfinder
+QT = core testlib
 HEADERS += 
 SOURCES += tst_qtextboundaryfinder.cpp 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/corelib/tools/qtime/qtime.pro b/tests/auto/corelib/tools/qtime/qtime.pro
index ce4f7ae..bc2c58c 100644
--- a/tests/auto/corelib/tools/qtime/qtime.pro
+++ b/tests/auto/corelib/tools/qtime/qtime.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qtime
 SOURCES += tst_qtime.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qtimeline/qtimeline.pro b/tests/auto/corelib/tools/qtimeline/qtimeline.pro
index 9be717d..6dfd22a 100644
--- a/tests/auto/corelib/tools/qtimeline/qtimeline.pro
+++ b/tests/auto/corelib/tools/qtimeline/qtimeline.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-QT = core
+CONFIG += testcase
+TARGET = tst_qtimeline
+QT = core testlib
 SOURCES  += tst_qtimeline.cpp
-QT = core
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qvarlengtharray/qvarlengtharray.pro b/tests/auto/corelib/tools/qvarlengtharray/qvarlengtharray.pro
index 183da1b..cb1cb38 100644
--- a/tests/auto/corelib/tools/qvarlengtharray/qvarlengtharray.pro
+++ b/tests/auto/corelib/tools/qvarlengtharray/qvarlengtharray.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-QT = core
+CONFIG += testcase
+TARGET = tst_qvarlengtharray
+QT = core testlib
 SOURCES  += tst_qvarlengtharray.cpp
-QT = core
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qvector/qvector.pro b/tests/auto/corelib/tools/qvector/qvector.pro
index a7c3957..12efcc6 100644
--- a/tests/auto/corelib/tools/qvector/qvector.pro
+++ b/tests/auto/corelib/tools/qvector/qvector.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qvector
 SOURCES  += tst_qvector.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/xml/qxmlstream/qxmlstream.pro b/tests/auto/corelib/xml/qxmlstream/qxmlstream.pro
index 73a282d..160aaf8 100644
--- a/tests/auto/corelib/xml/qxmlstream/qxmlstream.pro
+++ b/tests/auto/corelib/xml/qxmlstream/qxmlstream.pro
@@ -1,7 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qxmlstream
 SOURCES += tst_qxmlstream.cpp
 
-QT = core xml network
+QT = core xml network testlib
 
 wince* {
     addFiles.files = data XML-Test-Suite
diff --git a/tests/auto/qobjectrace/qobjectrace.pro b/tests/auto/qobjectrace/qobjectrace.pro
index 526875b..9a0d8e5 100644
--- a/tests/auto/qobjectrace/qobjectrace.pro
+++ b/tests/auto/qobjectrace/qobjectrace.pro
@@ -1,6 +1,6 @@
-load(qttest_p4)
+CONFIG += testcase
 SOURCES += tst_qobjectrace.cpp
-QT = core
+QT = core testlib
 
 TARGET.EPOCHEAPSIZE = 20000000 40000000
 CONFIG += parallel_test
diff --git a/tests/auto/utf8/utf8.pro b/tests/auto/utf8/utf8.pro
index aa133fe..2d200e8 100644
--- a/tests/auto/utf8/utf8.pro
+++ b/tests/auto/utf8/utf8.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
-QT -= gui
+CONFIG += testcase
+TARGET = tst_utf8
+QT = core testlib
 SOURCES  += tst_utf8.cpp
 CONFIG += parallel_test