summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/auto/corelib/animation/qabstractanimation/qabstractanimation.pro5
-rw-r--r--tests/auto/corelib/animation/qanimationgroup/qanimationgroup.pro5
-rw-r--r--tests/auto/corelib/animation/qparallelanimationgroup/qparallelanimationgroup.pro5
-rw-r--r--tests/auto/corelib/animation/qpauseanimation/qpauseanimation.pro5
-rw-r--r--tests/auto/corelib/animation/qpropertyanimation/qpropertyanimation.pro5
-rw-r--r--tests/auto/corelib/animation/qsequentialanimationgroup/qsequentialanimationgroup.pro5
-rw-r--r--tests/auto/corelib/animation/qvariantanimation/qvariantanimation.pro5
-rw-r--r--tests/auto/corelib/codecs/qtextcodec/test/test.pro3
-rw-r--r--tests/auto/corelib/concurrent/qfuture/qfuture.pro5
-rw-r--r--tests/auto/corelib/concurrent/qfuturesynchronizer/qfuturesynchronizer.pro5
-rw-r--r--tests/auto/corelib/concurrent/qfuturewatcher/qfuturewatcher.pro5
-rw-r--r--tests/auto/corelib/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro5
-rw-r--r--tests/auto/corelib/concurrent/qtconcurrentiteratekernel/qtconcurrentiteratekernel.pro5
-rw-r--r--tests/auto/corelib/concurrent/qtconcurrentmap/qtconcurrentmap.pro5
-rw-r--r--tests/auto/corelib/concurrent/qtconcurrentresultstore/qtconcurrentresultstore.pro5
-rw-r--r--tests/auto/corelib/concurrent/qtconcurrentrun/qtconcurrentrun.pro5
-rw-r--r--tests/auto/corelib/concurrent/qtconcurrentthreadengine/qtconcurrentthreadengine.pro5
-rw-r--r--tests/auto/corelib/concurrent/qthreadpool/qthreadpool.pro5
-rw-r--r--tests/auto/corelib/global/q_func_info/q_func_info.pro5
-rw-r--r--tests/auto/corelib/global/qflags/qflags.pro5
-rw-r--r--tests/auto/corelib/global/qgetputenv/qgetputenv.pro5
-rw-r--r--tests/auto/corelib/global/qglobal/qglobal.pro5
-rw-r--r--tests/auto/corelib/global/qnumeric/qnumeric.pro6
-rw-r--r--tests/auto/corelib/global/qrand/qrand.pro5
-rw-r--r--tests/auto/corelib/io/qabstractfileengine/qabstractfileengine.pro5
-rw-r--r--tests/auto/corelib/io/qbuffer/qbuffer.pro5
-rw-r--r--tests/auto/corelib/io/qdatastream/qdatastream.pro5
-rw-r--r--tests/auto/corelib/io/qdebug/qdebug.pro5
-rw-r--r--tests/auto/corelib/io/qdir/qdir.pro5
-rw-r--r--tests/auto/corelib/io/qdiriterator/qdiriterator.pro5
-rw-r--r--tests/auto/corelib/io/qfile/largefile/largefile.pro5
-rw-r--r--tests/auto/corelib/io/qfile/test/test.pro6
-rw-r--r--tests/auto/corelib/io/qfileinfo/qfileinfo.pro5
-rw-r--r--tests/auto/corelib/io/qfilesystementry/qfilesystementry.pro5
-rw-r--r--tests/auto/corelib/io/qfilesystemwatcher/qfilesystemwatcher.pro5
-rw-r--r--tests/auto/corelib/io/qiodevice/qiodevice.pro5
-rw-r--r--tests/auto/corelib/io/qprocess/test/test.pro4
-rw-r--r--tests/auto/corelib/io/qprocessenvironment/qprocessenvironment.pro5
-rw-r--r--tests/auto/corelib/io/qresourceengine/qresourceengine.pro4
-rw-r--r--tests/auto/corelib/io/qsettings/qsettings.pro5
-rw-r--r--tests/auto/corelib/io/qtemporaryfile/qtemporaryfile.pro5
-rw-r--r--tests/auto/corelib/io/qtextstream/test/test.pro4
-rw-r--r--tests/auto/corelib/io/qurl/qurl.pro5
-rw-r--r--tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro5
-rw-r--r--tests/auto/corelib/kernel/qcoreapplication/qcoreapplication.pro5
-rw-r--r--tests/auto/corelib/kernel/qeventloop/qeventloop.pro5
-rw-r--r--tests/auto/corelib/kernel/qitemmodel/qitemmodel.pro5
-rw-r--r--tests/auto/corelib/kernel/qmath/qmath.pro6
-rw-r--r--tests/auto/corelib/kernel/qmetaobject/qmetaobject.pro5
-rw-r--r--tests/auto/corelib/kernel/qmetaproperty/qmetaproperty.pro5
-rw-r--r--tests/auto/corelib/kernel/qmetatype/qmetatype.pro5
-rw-r--r--tests/auto/corelib/kernel/qmimedata/qmimedata.pro5
-rw-r--r--tests/auto/corelib/kernel/qobject/tst_qobject.pro7
-rw-r--r--tests/auto/corelib/kernel/qpointer/qpointer.pro5
-rw-r--r--tests/auto/corelib/kernel/qsignalmapper/qsignalmapper.pro5
-rw-r--r--tests/auto/corelib/kernel/qsocketnotifier/qsocketnotifier.pro5
-rw-r--r--tests/auto/corelib/kernel/qtimer/qtimer.pro6
-rw-r--r--tests/auto/corelib/kernel/qtipc/qsharedmemory/test/test.pro4
-rw-r--r--tests/auto/corelib/kernel/qtipc/qsystemsemaphore/qsystemsemaphore.pro4
-rw-r--r--tests/auto/corelib/kernel/qtranslator/qtranslator.pro5
-rw-r--r--tests/auto/corelib/kernel/qvariant/qvariant.pro5
-rw-r--r--tests/auto/corelib/kernel/qwineventnotifier/qwineventnotifier.pro5
-rw-r--r--tests/auto/corelib/plugin/qlibrary/tst/tst.pro4
-rw-r--r--tests/auto/corelib/plugin/qplugin/tst_qplugin.pro5
-rw-r--r--tests/auto/corelib/plugin/qpluginloader/tst/tst.pro4
-rw-r--r--tests/auto/corelib/plugin/quuid/test/test.pro4
-rw-r--r--tests/auto/corelib/statemachine/qstate/qstate.pro5
-rw-r--r--tests/auto/corelib/statemachine/qstatemachine/qstatemachine.pro5
-rw-r--r--tests/auto/corelib/thread/qatomicint/qatomicint.pro5
-rw-r--r--tests/auto/corelib/thread/qatomicpointer/qatomicpointer.pro5
-rw-r--r--tests/auto/corelib/thread/qmutex/qmutex.pro5
-rw-r--r--tests/auto/corelib/thread/qmutexlocker/qmutexlocker.pro5
-rw-r--r--tests/auto/corelib/thread/qreadlocker/qreadlocker.pro5
-rw-r--r--tests/auto/corelib/thread/qreadwritelock/qreadwritelock.pro5
-rw-r--r--tests/auto/corelib/thread/qsemaphore/qsemaphore.pro5
-rw-r--r--tests/auto/corelib/thread/qthread/qthread.pro5
-rw-r--r--tests/auto/corelib/thread/qthreadonce/qthreadonce.pro5
-rw-r--r--tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.pro5
-rw-r--r--tests/auto/corelib/thread/qwaitcondition/qwaitcondition.pro5
-rw-r--r--tests/auto/corelib/thread/qwritelocker/qwritelocker.pro5
-rw-r--r--tests/auto/corelib/tools/qalgorithms/qalgorithms.pro5
-rw-r--r--tests/auto/corelib/tools/qbitarray/qbitarray.pro5
-rw-r--r--tests/auto/corelib/tools/qbytearray/qbytearray.pro5
-rw-r--r--tests/auto/corelib/tools/qbytearraymatcher/qbytearraymatcher.pro5
-rw-r--r--tests/auto/corelib/tools/qcache/qcache.pro5
-rw-r--r--tests/auto/corelib/tools/qchar/qchar.pro5
-rw-r--r--tests/auto/corelib/tools/qcryptographichash/qcryptographichash.pro5
-rw-r--r--tests/auto/corelib/tools/qdate/qdate.pro5
-rw-r--r--tests/auto/corelib/tools/qdatetime/qdatetime.pro5
-rw-r--r--tests/auto/corelib/tools/qeasingcurve/qeasingcurve.pro5
-rw-r--r--tests/auto/corelib/tools/qelapsedtimer/qelapsedtimer.pro5
-rw-r--r--tests/auto/corelib/tools/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro5
-rw-r--r--tests/auto/corelib/tools/qfreelist/qfreelist.pro5
-rw-r--r--tests/auto/corelib/tools/qhash/qhash.pro5
-rw-r--r--tests/auto/corelib/tools/qline/qline.pro5
-rw-r--r--tests/auto/corelib/tools/qlist/qlist.pro5
-rw-r--r--tests/auto/corelib/tools/qlocale/test/test.pro4
-rw-r--r--tests/auto/corelib/tools/qmap/qmap.pro6
-rw-r--r--tests/auto/corelib/tools/qmargins/qmargins.pro5
-rw-r--r--tests/auto/corelib/tools/qpoint/qpoint.pro5
-rw-r--r--tests/auto/corelib/tools/qqueue/qqueue.pro6
-rw-r--r--tests/auto/corelib/tools/qrect/qrect.pro5
-rw-r--r--tests/auto/corelib/tools/qregexp/qregexp.pro8
-rw-r--r--tests/auto/corelib/tools/qringbuffer/qringbuffer.pro5
-rw-r--r--tests/auto/corelib/tools/qscopedpointer/qscopedpointer.pro5
-rw-r--r--tests/auto/corelib/tools/qscopedvaluerollback/qscopedvaluerollback.pro5
-rw-r--r--tests/auto/corelib/tools/qset/qset.pro5
-rw-r--r--tests/auto/corelib/tools/qsharedpointer/qsharedpointer.pro5
-rw-r--r--tests/auto/corelib/tools/qsize/qsize.pro5
-rw-r--r--tests/auto/corelib/tools/qsizef/qsizef.pro5
-rw-r--r--tests/auto/corelib/tools/qstl/qstl.pro5
-rw-r--r--tests/auto/corelib/tools/qstring/qstring.pro5
-rw-r--r--tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/qstringbuilder1.pro5
-rw-r--r--tests/auto/corelib/tools/qstringbuilder/qstringbuilder2/qstringbuilder2.pro5
-rw-r--r--tests/auto/corelib/tools/qstringbuilder/qstringbuilder3/qstringbuilder3.pro5
-rw-r--r--tests/auto/corelib/tools/qstringbuilder/qstringbuilder4/qstringbuilder4.pro5
-rw-r--r--tests/auto/corelib/tools/qstringlist/qstringlist.pro5
-rw-r--r--tests/auto/corelib/tools/qstringmatcher/qstringmatcher.pro5
-rw-r--r--tests/auto/corelib/tools/qstringref/qstringref.pro5
-rw-r--r--tests/auto/corelib/tools/qtextboundaryfinder/qtextboundaryfinder.pro5
-rw-r--r--tests/auto/corelib/tools/qtime/qtime.pro5
-rw-r--r--tests/auto/corelib/tools/qtimeline/qtimeline.pro6
-rw-r--r--tests/auto/corelib/tools/qvarlengtharray/qvarlengtharray.pro6
-rw-r--r--tests/auto/corelib/tools/qvector/qvector.pro5
-rw-r--r--tests/auto/corelib/xml/qxmlstream/qxmlstream.pro5
-rw-r--r--tests/auto/qobjectrace/qobjectrace.pro4
-rw-r--r--tests/auto/utf8/utf8.pro5
127 files changed, 371 insertions, 265 deletions
diff --git a/tests/auto/corelib/animation/qabstractanimation/qabstractanimation.pro b/tests/auto/corelib/animation/qabstractanimation/qabstractanimation.pro
index f518423765..a948003ca9 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 5e1be0cb10..179412a387 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 f2cacd3452..e18d17b4f8 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 7f612b69fe..e254c67b7a 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 4dfd558610..2286688471 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 c0c10c054d..810e0a7bb8 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 6c463051e8..2b16d6949c 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 1ec278d9ea..6178fcf665 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 0e74f47678..606c15a5a6 100644
--- a/tests/auto/corelib/concurrent/qfuture/qfuture.pro
+++ b/tests/auto/corelib/concurrent/qfuture/qfuture.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qfuture
DEFINES += QT_STRICT_ITERATORS
SOURCES += tst_qfuture.cpp
-QT = core core-private
+QT = core core-private testlib
CONFIG += parallel_test
diff --git a/tests/auto/corelib/concurrent/qfuturesynchronizer/qfuturesynchronizer.pro b/tests/auto/corelib/concurrent/qfuturesynchronizer/qfuturesynchronizer.pro
index 11012cce24..18cc00d7a3 100644
--- a/tests/auto/corelib/concurrent/qfuturesynchronizer/qfuturesynchronizer.pro
+++ b/tests/auto/corelib/concurrent/qfuturesynchronizer/qfuturesynchronizer.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT = core
+CONFIG += testcase
+TARGET = tst_qfuturesynchronizer
+QT = core testlib
SOURCES += tst_qfuturesynchronizer.cpp \
CONFIG += parallel_test
diff --git a/tests/auto/corelib/concurrent/qfuturewatcher/qfuturewatcher.pro b/tests/auto/corelib/concurrent/qfuturewatcher/qfuturewatcher.pro
index 9de37d014f..a69232156c 100644
--- a/tests/auto/corelib/concurrent/qfuturewatcher/qfuturewatcher.pro
+++ b/tests/auto/corelib/concurrent/qfuturewatcher/qfuturewatcher.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qfuturewatcher
SOURCES += tst_qfuturewatcher.cpp
-QT = core core-private
+QT = core core-private testlib
CONFIG += parallel_test
diff --git a/tests/auto/corelib/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro b/tests/auto/corelib/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro
index c5cfb2a093..f325514015 100644
--- a/tests/auto/corelib/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro
+++ b/tests/auto/corelib/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qtconcurrentfilter
DEFINES += QT_STRICT_ITERATORS
SOURCES += tst_qtconcurrentfilter.cpp
-QT = core
+QT = core testlib
CONFIG += parallel_test
CONFIG += insignificant_test # See QTBUG-20688
diff --git a/tests/auto/corelib/concurrent/qtconcurrentiteratekernel/qtconcurrentiteratekernel.pro b/tests/auto/corelib/concurrent/qtconcurrentiteratekernel/qtconcurrentiteratekernel.pro
index c8cfe4c115..cf48c1e382 100644
--- a/tests/auto/corelib/concurrent/qtconcurrentiteratekernel/qtconcurrentiteratekernel.pro
+++ b/tests/auto/corelib/concurrent/qtconcurrentiteratekernel/qtconcurrentiteratekernel.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qtconcurrentiteratekernel
SOURCES += tst_qtconcurrentiteratekernel.cpp
-QT = core
+QT = core testlib
CONFIG += parallel_test
diff --git a/tests/auto/corelib/concurrent/qtconcurrentmap/qtconcurrentmap.pro b/tests/auto/corelib/concurrent/qtconcurrentmap/qtconcurrentmap.pro
index 4edfc64cb3..72bf95ec9e 100644
--- a/tests/auto/corelib/concurrent/qtconcurrentmap/qtconcurrentmap.pro
+++ b/tests/auto/corelib/concurrent/qtconcurrentmap/qtconcurrentmap.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qtconcurrentmap
DEFINES += QT_STRICT_ITERATORS
SOURCES += tst_qtconcurrentmap.cpp
-QT = core
+QT = core testlib
CONFIG += parallel_test
diff --git a/tests/auto/corelib/concurrent/qtconcurrentresultstore/qtconcurrentresultstore.pro b/tests/auto/corelib/concurrent/qtconcurrentresultstore/qtconcurrentresultstore.pro
index 8bc20c3f13..037bb89089 100644
--- a/tests/auto/corelib/concurrent/qtconcurrentresultstore/qtconcurrentresultstore.pro
+++ b/tests/auto/corelib/concurrent/qtconcurrentresultstore/qtconcurrentresultstore.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qtconcurrentresultstore
DEFINES += QT_STRICT_ITERATORS
SOURCES += tst_qtconcurrentresultstore.cpp
-QT = core core-private
+QT = core core-private testlib
CONFIG += parallel_test
diff --git a/tests/auto/corelib/concurrent/qtconcurrentrun/qtconcurrentrun.pro b/tests/auto/corelib/concurrent/qtconcurrentrun/qtconcurrentrun.pro
index dfccf06de9..19148677ec 100644
--- a/tests/auto/corelib/concurrent/qtconcurrentrun/qtconcurrentrun.pro
+++ b/tests/auto/corelib/concurrent/qtconcurrentrun/qtconcurrentrun.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qtconcurrentrun
SOURCES += tst_qtconcurrentrun.cpp
-QT = core
+QT = core testlib
CONFIG += parallel_test
diff --git a/tests/auto/corelib/concurrent/qtconcurrentthreadengine/qtconcurrentthreadengine.pro b/tests/auto/corelib/concurrent/qtconcurrentthreadengine/qtconcurrentthreadengine.pro
index d7e2464089..f734fc5282 100644
--- a/tests/auto/corelib/concurrent/qtconcurrentthreadengine/qtconcurrentthreadengine.pro
+++ b/tests/auto/corelib/concurrent/qtconcurrentthreadengine/qtconcurrentthreadengine.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qtconcurrentthreadengine
SOURCES += tst_qtconcurrentthreadengine.cpp
-QT = core
+QT = core testlib
CONFIG += parallel_test
diff --git a/tests/auto/corelib/concurrent/qthreadpool/qthreadpool.pro b/tests/auto/corelib/concurrent/qthreadpool/qthreadpool.pro
index dbaeb208dd..df13d5f82f 100644
--- a/tests/auto/corelib/concurrent/qthreadpool/qthreadpool.pro
+++ b/tests/auto/corelib/concurrent/qthreadpool/qthreadpool.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qthreadpool
SOURCES += tst_qthreadpool.cpp
-QT = core
+QT = core testlib
CONFIG += parallel_test
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 64f08d4d8d..d657fd80ee 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 097a218a5a..eeb204f51f 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 df94f14473..ccfac7b8a7 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 a4dffac815..b4bcf0524f 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 c0af962a79..67b7a8de65 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 0db8af821c..552592e2e4 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 870473a4cb..d498b530bc 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 b768eb82d8..9745fcd862 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 5d80b4f65c..2cb4282296 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 2b5716860c..b6a91a7703 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 3f63978970..44cf644b37 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 f9f5c8d664..ec9065bf19 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 7786bdb892..5b5cf49f86 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 366432c57e..44dd20cf50 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 c3b9f4c2e3..42a045dc23 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 992c90cfcc..7990bb69c3 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 d3549b2f05..b7ba6d260e 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 0d580b824c..7ef227dd57 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 5581077387..3bac7eae3d 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 60dba50813..b05b8a5265 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 09509ecf08..e8c6f36c6c 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 f15e40b267..ac85ea8f41 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 dda224ca78..0c43b9c39c 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 79252b2c5f..8a0c9d4fb1 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 e6976e3c21..99aeb56d37 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 eee2222cda..b3551dad9f 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 031af39df7..33ac65d9ee 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 e8f6bbac66..822878e7d2 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 c44fa5a151..f02b14997f 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 e5784ce7aa..90e61d7132 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 7a4cf94e47..d5fc3d2ee8 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 4369f33b4c..4ceb253125 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 ed1de83927..2841c5f139 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 13fbe65edc..e4cf4ce1a6 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 aac6bdc136..b52e25bb3b 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 5728b7bb4f..33a31ebc8c 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 5af4b70c63..4bca1ab67b 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 d8d1c3f681..a60104c1a4 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 086df1dd18..1b2422826d 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 c384e15f03..6893c58c70 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 c687e2d162..3c1cf75990 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 4e3f305216..0582499b2d 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 0fed3d837f..e81e4d7ce0 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 4a5ea78ed1..296aab32a8 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 76fd196745..c5035a8d67 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 527c26a60d..894be1c13b 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 671b3f3c62..4a11bf4935 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 dd8de74b28..0063493821 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 6ee7e0cd00..243a6963a5 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 9d057eb05f..1997e21726 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 7850d93dc7..dd18c7d6db 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 89ff137d39..dc6c54a2da 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 760dcfd2d8..cf567c2f65 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 01c369101b..9e44b5f84c 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 ee533070a7..13cdf0c58b 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 93f7c68dc3..c35023d46e 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 a75bf443bc..871bd97105 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 ae11d719c0..da3be3bf76 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 d7ef4d4c23..cd97917165 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 ae03169bcb..64f176748d 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 9af0c71301..b9cf3af5b3 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 39a98aaba5..946e75ca06 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 9143da658d..08271745ee 100644
--- a/tests/auto/corelib/tools/qalgorithms/qalgorithms.pro
+++ b/tests/auto/corelib/tools/qalgorithms/qalgorithms.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qalgorithms
SOURCES += tst_qalgorithms.cpp
-QT = core
+QT = core testlib
diff --git a/tests/auto/corelib/tools/qbitarray/qbitarray.pro b/tests/auto/corelib/tools/qbitarray/qbitarray.pro
index 358d81bad1..528ea58bbd 100644
--- a/tests/auto/corelib/tools/qbitarray/qbitarray.pro
+++ b/tests/auto/corelib/tools/qbitarray/qbitarray.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qbitarray
SOURCES += tst_qbitarray.cpp
-QT = core
+QT = core testlib
CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qbytearray/qbytearray.pro b/tests/auto/corelib/tools/qbytearray/qbytearray.pro
index d903be2cf6..91a47b235b 100644
--- a/tests/auto/corelib/tools/qbytearray/qbytearray.pro
+++ b/tests/auto/corelib/tools/qbytearray/qbytearray.pro
@@ -1,8 +1,9 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qbytearray
SOURCES += tst_qbytearray.cpp
-QT = core core-private
+QT = core core-private testlib
wince* {
addFile.files = rfc3252.txt
diff --git a/tests/auto/corelib/tools/qbytearraymatcher/qbytearraymatcher.pro b/tests/auto/corelib/tools/qbytearraymatcher/qbytearraymatcher.pro
index a2458e623f..a90511d889 100644
--- a/tests/auto/corelib/tools/qbytearraymatcher/qbytearraymatcher.pro
+++ b/tests/auto/corelib/tools/qbytearraymatcher/qbytearraymatcher.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qbytearraymatcher
SOURCES += tst_qbytearraymatcher.cpp
-QT = core
+QT = core testlib
CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qcache/qcache.pro b/tests/auto/corelib/tools/qcache/qcache.pro
index 0da4e1414f..bd2a683da2 100644
--- a/tests/auto/corelib/tools/qcache/qcache.pro
+++ b/tests/auto/corelib/tools/qcache/qcache.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qcache
SOURCES += tst_qcache.cpp
-QT = core
+QT = core testlib
CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qchar/qchar.pro b/tests/auto/corelib/tools/qchar/qchar.pro
index 57b564201d..4921144c01 100644
--- a/tests/auto/corelib/tools/qchar/qchar.pro
+++ b/tests/auto/corelib/tools/qchar/qchar.pro
@@ -1,7 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qchar
SOURCES += tst_qchar.cpp
-QT = core core-private
+QT = core core-private testlib
wince*: {
deploy.files += NormalizationTest.txt
diff --git a/tests/auto/corelib/tools/qcryptographichash/qcryptographichash.pro b/tests/auto/corelib/tools/qcryptographichash/qcryptographichash.pro
index 019221206b..4f4d12b2e6 100644
--- a/tests/auto/corelib/tools/qcryptographichash/qcryptographichash.pro
+++ b/tests/auto/corelib/tools/qcryptographichash/qcryptographichash.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qcryptographichash
SOURCES += tst_qcryptographichash.cpp
-QT = core
+QT = core testlib
CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qdate/qdate.pro b/tests/auto/corelib/tools/qdate/qdate.pro
index 1c041004d3..749c65e1f5 100644
--- a/tests/auto/corelib/tools/qdate/qdate.pro
+++ b/tests/auto/corelib/tools/qdate/qdate.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qdate
SOURCES += tst_qdate.cpp
-QT = core
+QT = core testlib
CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qdatetime/qdatetime.pro b/tests/auto/corelib/tools/qdatetime/qdatetime.pro
index cd335826ec..33c777fcf7 100644
--- a/tests/auto/corelib/tools/qdatetime/qdatetime.pro
+++ b/tests/auto/corelib/tools/qdatetime/qdatetime.pro
@@ -1,7 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qdatetime
SOURCES += tst_qdatetime.cpp
-QT = core core-private
+QT = core core-private testlib
# For some reason using optimization here triggers a compiler issue, which causes an exception
# However, the code is correct
diff --git a/tests/auto/corelib/tools/qeasingcurve/qeasingcurve.pro b/tests/auto/corelib/tools/qeasingcurve/qeasingcurve.pro
index 2a3a075d8a..03d71bb6d9 100644
--- a/tests/auto/corelib/tools/qeasingcurve/qeasingcurve.pro
+++ b/tests/auto/corelib/tools/qeasingcurve/qeasingcurve.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
-QT = core
+CONFIG += testcase
+TARGET = tst_qeasingcurve
+QT = core testlib
SOURCES += tst_qeasingcurve.cpp
CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qelapsedtimer/qelapsedtimer.pro b/tests/auto/corelib/tools/qelapsedtimer/qelapsedtimer.pro
index 30714f39dc..1efacfe06f 100644
--- a/tests/auto/corelib/tools/qelapsedtimer/qelapsedtimer.pro
+++ b/tests/auto/corelib/tools/qelapsedtimer/qelapsedtimer.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT -= gui
+CONFIG += testcase
+TARGET = tst_qelapsedtimer
+QT = core testlib
SOURCES += tst_qelapsedtimer.cpp
wince* {
diff --git a/tests/auto/corelib/tools/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro b/tests/auto/corelib/tools/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro
index cf574ffc40..9064d0263a 100644
--- a/tests/auto/corelib/tools/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro
+++ b/tests/auto/corelib/tools/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qexplicitlyshareddatapointer
SOURCES += tst_qexplicitlyshareddatapointer.cpp
-QT = core
+QT = core testlib
CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qfreelist/qfreelist.pro b/tests/auto/corelib/tools/qfreelist/qfreelist.pro
index 0afa12b8a8..2c3c6932f4 100644
--- a/tests/auto/corelib/tools/qfreelist/qfreelist.pro
+++ b/tests/auto/corelib/tools/qfreelist/qfreelist.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qfreelist
SOURCES += tst_qfreelist.cpp
-QT += core-private
+QT += core-private testlib
QT -= gui
!contains(QT_CONFIG,private_tests): SOURCES += $$QT.core.sources/tools/qfreelist.cpp
diff --git a/tests/auto/corelib/tools/qhash/qhash.pro b/tests/auto/corelib/tools/qhash/qhash.pro
index 3baa2093b7..171a26edb1 100644
--- a/tests/auto/corelib/tools/qhash/qhash.pro
+++ b/tests/auto/corelib/tools/qhash/qhash.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qhash
SOURCES += tst_qhash.cpp
-QT = core
+QT = core testlib
CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qline/qline.pro b/tests/auto/corelib/tools/qline/qline.pro
index 9ad7b737f1..9b413e8557 100644
--- a/tests/auto/corelib/tools/qline/qline.pro
+++ b/tests/auto/corelib/tools/qline/qline.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT -= gui
+CONFIG += testcase
+TARGET = tst_qline
+QT = core testlib
SOURCES += tst_qline.cpp
unix:!mac:!vxworks:LIBS+=-lm
diff --git a/tests/auto/corelib/tools/qlist/qlist.pro b/tests/auto/corelib/tools/qlist/qlist.pro
index 708589e74d..4ab25d0b19 100644
--- a/tests/auto/corelib/tools/qlist/qlist.pro
+++ b/tests/auto/corelib/tools/qlist/qlist.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT = core
+CONFIG += testcase
+TARGET = tst_qlist
+QT = core testlib
SOURCES += tst_qlist.cpp
diff --git a/tests/auto/corelib/tools/qlocale/test/test.pro b/tests/auto/corelib/tools/qlocale/test/test.pro
index 8416692230..2cfa593863 100644
--- a/tests/auto/corelib/tools/qlocale/test/test.pro
+++ b/tests/auto/corelib/tools/qlocale/test/test.pro
@@ -1,4 +1,4 @@
-load(qttest_p4)
+CONFIG += testcase
SOURCES += ../tst_qlocale.cpp
!wince*: {
@@ -17,7 +17,7 @@ win32: {
-QT = core
+QT = core testlib
QT += network
embedded: QT += gui
diff --git a/tests/auto/corelib/tools/qmap/qmap.pro b/tests/auto/corelib/tools/qmap/qmap.pro
index eaed926481..fc4c84c58d 100644
--- a/tests/auto/corelib/tools/qmap/qmap.pro
+++ b/tests/auto/corelib/tools/qmap/qmap.pro
@@ -1,7 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qmap
-QT = core
+QT = core testlib
SOURCES += tst_qmap.cpp
-QT = core
CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qmargins/qmargins.pro b/tests/auto/corelib/tools/qmargins/qmargins.pro
index 0404da0424..02478c3f61 100644
--- a/tests/auto/corelib/tools/qmargins/qmargins.pro
+++ b/tests/auto/corelib/tools/qmargins/qmargins.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qmargins
SOURCES += tst_qmargins.cpp
-QT = core
+QT = core testlib
CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qpoint/qpoint.pro b/tests/auto/corelib/tools/qpoint/qpoint.pro
index fd240461e2..cd501f648c 100644
--- a/tests/auto/corelib/tools/qpoint/qpoint.pro
+++ b/tests/auto/corelib/tools/qpoint/qpoint.pro
@@ -2,7 +2,8 @@
# Project file for autotest for file qpoint.h
############################################################
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qpoint
SOURCES += tst_qpoint.cpp
-QT = core
+QT = core testlib
CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qqueue/qqueue.pro b/tests/auto/corelib/tools/qqueue/qqueue.pro
index ce0d8c30ca..4a515d719d 100644
--- a/tests/auto/corelib/tools/qqueue/qqueue.pro
+++ b/tests/auto/corelib/tools/qqueue/qqueue.pro
@@ -1,7 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qqueue
-QT = core
+QT = core testlib
SOURCES += tst_qqueue.cpp
-QT = core
CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qrect/qrect.pro b/tests/auto/corelib/tools/qrect/qrect.pro
index f1ad046e34..149d194e21 100644
--- a/tests/auto/corelib/tools/qrect/qrect.pro
+++ b/tests/auto/corelib/tools/qrect/qrect.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qrect
SOURCES += tst_qrect.cpp
-QT = core
+QT = core testlib
CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qregexp/qregexp.pro b/tests/auto/corelib/tools/qregexp/qregexp.pro
index e0fef12479..96302354db 100644
--- a/tests/auto/corelib/tools/qregexp/qregexp.pro
+++ b/tests/auto/corelib/tools/qregexp/qregexp.pro
@@ -1,9 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qregexp
-QT = core
-
-
-QT = core
+QT = core testlib
SOURCES += tst_qregexp.cpp
CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qringbuffer/qringbuffer.pro b/tests/auto/corelib/tools/qringbuffer/qringbuffer.pro
index dc572d0633..2f595ec8b0 100644
--- a/tests/auto/corelib/tools/qringbuffer/qringbuffer.pro
+++ b/tests/auto/corelib/tools/qringbuffer/qringbuffer.pro
@@ -1,7 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qringbuffer
SOURCES += tst_qringbuffer.cpp
-QT = core core-private
+QT = core core-private testlib
CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qscopedpointer/qscopedpointer.pro b/tests/auto/corelib/tools/qscopedpointer/qscopedpointer.pro
index 4a3d5b8de8..1aa5e33ad2 100644
--- a/tests/auto/corelib/tools/qscopedpointer/qscopedpointer.pro
+++ b/tests/auto/corelib/tools/qscopedpointer/qscopedpointer.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qscopedpointer
SOURCES += tst_qscopedpointer.cpp
-QT -= gui
+QT = core testlib
CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qscopedvaluerollback/qscopedvaluerollback.pro b/tests/auto/corelib/tools/qscopedvaluerollback/qscopedvaluerollback.pro
index f06e21ba1f..85aab77e91 100644
--- a/tests/auto/corelib/tools/qscopedvaluerollback/qscopedvaluerollback.pro
+++ b/tests/auto/corelib/tools/qscopedvaluerollback/qscopedvaluerollback.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qscopedvaluerollback
SOURCES += tst_qscopedvaluerollback.cpp
-QT -= gui
+QT = core testlib
CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qset/qset.pro b/tests/auto/corelib/tools/qset/qset.pro
index 4efc6c7033..0e456c6b3a 100644
--- a/tests/auto/corelib/tools/qset/qset.pro
+++ b/tests/auto/corelib/tools/qset/qset.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qset
SOURCES += tst_qset.cpp
-QT = core
+QT = core testlib
CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qsharedpointer/qsharedpointer.pro b/tests/auto/corelib/tools/qsharedpointer/qsharedpointer.pro
index 5a941f6232..2e822f6a03 100644
--- a/tests/auto/corelib/tools/qsharedpointer/qsharedpointer.pro
+++ b/tests/auto/corelib/tools/qsharedpointer/qsharedpointer.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qsharedpointer
SOURCES += tst_qsharedpointer.cpp \
forwarddeclaration.cpp \
@@ -8,7 +9,7 @@ SOURCES += tst_qsharedpointer.cpp \
HEADERS += forwarddeclared.h \
wrapper.h
-QT = core
+QT = core testlib
DEFINES += SRCDIR=\\\"$$PWD/\\\"
include(externaltests.pri)
diff --git a/tests/auto/corelib/tools/qsize/qsize.pro b/tests/auto/corelib/tools/qsize/qsize.pro
index a1814ac8c5..140205bd6b 100644
--- a/tests/auto/corelib/tools/qsize/qsize.pro
+++ b/tests/auto/corelib/tools/qsize/qsize.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qsize
SOURCES += tst_qsize.cpp
-QT = core
+QT = core testlib
CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qsizef/qsizef.pro b/tests/auto/corelib/tools/qsizef/qsizef.pro
index 5aa07d72a1..e0e9b0d43a 100644
--- a/tests/auto/corelib/tools/qsizef/qsizef.pro
+++ b/tests/auto/corelib/tools/qsizef/qsizef.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qsizef
SOURCES += tst_qsizef.cpp
-QT = core
+QT = core testlib
CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qstl/qstl.pro b/tests/auto/corelib/tools/qstl/qstl.pro
index a0c9db1dfc..128ee562cc 100644
--- a/tests/auto/corelib/tools/qstl/qstl.pro
+++ b/tests/auto/corelib/tools/qstl/qstl.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qstl
SOURCES += tst_qstl.cpp
-QT = core
+QT = core testlib
CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qstring/qstring.pro b/tests/auto/corelib/tools/qstring/qstring.pro
index cdf28520fa..4515c32df2 100644
--- a/tests/auto/corelib/tools/qstring/qstring.pro
+++ b/tests/auto/corelib/tools/qstring/qstring.pro
@@ -1,7 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qstring
SOURCES += tst_qstring.cpp
-QT = core
+QT = core testlib
DEFINES += QT_NO_CAST_TO_ASCII
CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/qstringbuilder1.pro b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/qstringbuilder1.pro
index dc9062f4da..1888450699 100644
--- a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/qstringbuilder1.pro
+++ b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/qstringbuilder1.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qstringbuilder1
-QT = core
+QT = core testlib
SOURCES += tst_qstringbuilder1.cpp
diff --git a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder2/qstringbuilder2.pro b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder2/qstringbuilder2.pro
index a57c6f19f2..8a1554da9e 100644
--- a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder2/qstringbuilder2.pro
+++ b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder2/qstringbuilder2.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qstringbuilder2
-QT = core
+QT = core testlib
SOURCES += tst_qstringbuilder2.cpp
CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder3/qstringbuilder3.pro b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder3/qstringbuilder3.pro
index 5aced7c258..00e64eee5c 100644
--- a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder3/qstringbuilder3.pro
+++ b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder3/qstringbuilder3.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qstringbuilder3
-QT = core
+QT = core testlib
SOURCES += tst_qstringbuilder3.cpp
CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder4/qstringbuilder4.pro b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder4/qstringbuilder4.pro
index 0532a9b925..ef7893c977 100644
--- a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder4/qstringbuilder4.pro
+++ b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder4/qstringbuilder4.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qstringbuilder4
-QT = core
+QT = core testlib
SOURCES += tst_qstringbuilder4.cpp
CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qstringlist/qstringlist.pro b/tests/auto/corelib/tools/qstringlist/qstringlist.pro
index d82a3487fd..73b8559360 100644
--- a/tests/auto/corelib/tools/qstringlist/qstringlist.pro
+++ b/tests/auto/corelib/tools/qstringlist/qstringlist.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qstringlist
SOURCES += tst_qstringlist.cpp
-QT = core
+QT = core testlib
CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qstringmatcher/qstringmatcher.pro b/tests/auto/corelib/tools/qstringmatcher/qstringmatcher.pro
index c5249ec84a..059916365e 100644
--- a/tests/auto/corelib/tools/qstringmatcher/qstringmatcher.pro
+++ b/tests/auto/corelib/tools/qstringmatcher/qstringmatcher.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qstringmatcher
SOURCES += tst_qstringmatcher.cpp
-QT = core
+QT = core testlib
DEFINES += QT_NO_CAST_TO_ASCII
CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qstringref/qstringref.pro b/tests/auto/corelib/tools/qstringref/qstringref.pro
index 34f2de46ae..7aa5f38001 100644
--- a/tests/auto/corelib/tools/qstringref/qstringref.pro
+++ b/tests/auto/corelib/tools/qstringref/qstringref.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qstringref
SOURCES += tst_qstringref.cpp
-QT = core
+QT = core testlib
CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qtextboundaryfinder/qtextboundaryfinder.pro b/tests/auto/corelib/tools/qtextboundaryfinder/qtextboundaryfinder.pro
index 244f9d2f31..5d50d2c477 100644
--- a/tests/auto/corelib/tools/qtextboundaryfinder/qtextboundaryfinder.pro
+++ b/tests/auto/corelib/tools/qtextboundaryfinder/qtextboundaryfinder.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT = core
+CONFIG += testcase
+TARGET = tst_qtextboundaryfinder
+QT = core testlib
HEADERS +=
SOURCES += tst_qtextboundaryfinder.cpp
DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/corelib/tools/qtime/qtime.pro b/tests/auto/corelib/tools/qtime/qtime.pro
index ce4f7ae91f..bc2c58cacd 100644
--- a/tests/auto/corelib/tools/qtime/qtime.pro
+++ b/tests/auto/corelib/tools/qtime/qtime.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qtime
SOURCES += tst_qtime.cpp
-QT = core
+QT = core testlib
CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qtimeline/qtimeline.pro b/tests/auto/corelib/tools/qtimeline/qtimeline.pro
index 9be717dba8..6dfd22af95 100644
--- a/tests/auto/corelib/tools/qtimeline/qtimeline.pro
+++ b/tests/auto/corelib/tools/qtimeline/qtimeline.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-QT = core
+CONFIG += testcase
+TARGET = tst_qtimeline
+QT = core testlib
SOURCES += tst_qtimeline.cpp
-QT = core
CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qvarlengtharray/qvarlengtharray.pro b/tests/auto/corelib/tools/qvarlengtharray/qvarlengtharray.pro
index 183da1b938..cb1cb38a57 100644
--- a/tests/auto/corelib/tools/qvarlengtharray/qvarlengtharray.pro
+++ b/tests/auto/corelib/tools/qvarlengtharray/qvarlengtharray.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-QT = core
+CONFIG += testcase
+TARGET = tst_qvarlengtharray
+QT = core testlib
SOURCES += tst_qvarlengtharray.cpp
-QT = core
CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qvector/qvector.pro b/tests/auto/corelib/tools/qvector/qvector.pro
index a7c3957f2c..12efcc63a8 100644
--- a/tests/auto/corelib/tools/qvector/qvector.pro
+++ b/tests/auto/corelib/tools/qvector/qvector.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qvector
SOURCES += tst_qvector.cpp
-QT = core
+QT = core testlib
CONFIG += parallel_test
diff --git a/tests/auto/corelib/xml/qxmlstream/qxmlstream.pro b/tests/auto/corelib/xml/qxmlstream/qxmlstream.pro
index 73a282dfb1..160aaf898c 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 526875b69d..9a0d8e58c4 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 aa133fe3ee..2d200e82a4 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