Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team:
  tests: eliminated usage of qttest_p4.prf

105 files changed, 308 insertions, 247 deletions

diff --git a/tests/auto/collections/collections.pro b/tests/auto/collections/collections.pro
index 8601ff8..364ae21 100644
--- a/tests/auto/collections/collections.pro
+++ b/tests/auto/collections/collections.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_collections
 SOURCES  += tst_collections.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/compiler/compiler.pro b/tests/auto/compiler/compiler.pro
index c444c63..e6307ac 100644
--- a/tests/auto/compiler/compiler.pro
+++ b/tests/auto/compiler/compiler.pro
@@ -1,7 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_compiler
 SOURCES += tst_compiler.cpp baseclass.cpp derivedclass.cpp
 HEADERS += baseclass.h derivedclass.h
-QT = core
+QT = core testlib
 
 
 
diff --git a/tests/auto/exceptionsafety/exceptionsafety.pro b/tests/auto/exceptionsafety/exceptionsafety.pro
index 52ba9e2..66abe49 100644
--- a/tests/auto/exceptionsafety/exceptionsafety.pro
+++ b/tests/auto/exceptionsafety/exceptionsafety.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_exceptionsafety
 SOURCES += tst_exceptionsafety.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/macplist/app/app.pro b/tests/auto/macplist/app/app.pro
index c1cf52e..6a976cb 100644
--- a/tests/auto/macplist/app/app.pro
+++ b/tests/auto/macplist/app/app.pro
@@ -1,7 +1,3 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Wed Jan 7 13:01:11 2009
-######################################################################
-
 TEMPLATE = app
 TARGET = 
 DEPENDPATH += .
diff --git a/tests/auto/macplist/test/test.pro b/tests/auto/macplist/test/test.pro
index 4751b47..5018abe 100644
--- a/tests/auto/macplist/test/test.pro
+++ b/tests/auto/macplist/test/test.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
+CONFIG += testcase
 
+QT += testlib
 SOURCES += ../tst_macplist.cpp
 TARGET = ../tst_macplist
 win32 {
diff --git a/tests/auto/q_func_info/q_func_info.pro b/tests/auto/q_func_info/q_func_info.pro
index 64f08d4..d657fd8 100644
--- a/tests/auto/q_func_info/q_func_info.pro
+++ b/tests/auto/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/qabstractfileengine/qabstractfileengine.pro b/tests/auto/qabstractfileengine/qabstractfileengine.pro
index 870473a..d498b53 100644
--- a/tests/auto/qabstractfileengine/qabstractfileengine.pro
+++ b/tests/auto/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/qanimationgroup/qanimationgroup.pro b/tests/auto/qanimationgroup/qanimationgroup.pro
index 5e1be0c..179412a 100644
--- a/tests/auto/qanimationgroup/qanimationgroup.pro
+++ b/tests/auto/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/qatomicint/qatomicint.pro b/tests/auto/qatomicint/qatomicint.pro
index 7850d93..dd18c7d 100644
--- a/tests/auto/qatomicint/qatomicint.pro
+++ b/tests/auto/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/qatomicpointer/qatomicpointer.pro b/tests/auto/qatomicpointer/qatomicpointer.pro
index 89ff137..dc6c54a 100644
--- a/tests/auto/qatomicpointer/qatomicpointer.pro
+++ b/tests/auto/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/qbitarray/qbitarray.pro b/tests/auto/qbitarray/qbitarray.pro
index 358d81b..528ea58 100644
--- a/tests/auto/qbitarray/qbitarray.pro
+++ b/tests/auto/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/qbuffer/qbuffer.pro b/tests/auto/qbuffer/qbuffer.pro
index b768eb8..9745fcd 100644
--- a/tests/auto/qbuffer/qbuffer.pro
+++ b/tests/auto/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/qbytearraymatcher/qbytearraymatcher.pro b/tests/auto/qbytearraymatcher/qbytearraymatcher.pro
index a2458e6..a90511d 100644
--- a/tests/auto/qbytearraymatcher/qbytearraymatcher.pro
+++ b/tests/auto/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/qcache/qcache.pro b/tests/auto/qcache/qcache.pro
index 0da4e14..bd2a683 100644
--- a/tests/auto/qcache/qcache.pro
+++ b/tests/auto/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/qcolor/qcolor.pro b/tests/auto/qcolor/qcolor.pro
index b9d437e..7dba0ce 100644
--- a/tests/auto/qcolor/qcolor.pro
+++ b/tests/auto/qcolor/qcolor.pro
@@ -1,5 +1,4 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qcolor
 SOURCES  += tst_qcolor.cpp
-
-
-
+QT += testlib
diff --git a/tests/auto/qcoreapplication/qcoreapplication.pro b/tests/auto/qcoreapplication/qcoreapplication.pro
index 031af39..33ac65d 100644
--- a/tests/auto/qcoreapplication/qcoreapplication.pro
+++ b/tests/auto/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/qdate/qdate.pro b/tests/auto/qdate/qdate.pro
index 1c04100..749c65e 100644
--- a/tests/auto/qdate/qdate.pro
+++ b/tests/auto/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/qdbusabstractinterface/test/test.pro b/tests/auto/qdbusabstractinterface/test/test.pro
index 98bcaa7..aba7f57 100644
--- a/tests/auto/qdbusabstractinterface/test/test.pro
+++ b/tests/auto/qdbusabstractinterface/test/test.pro
@@ -1,4 +1,4 @@
-load(qttest_p4)
+CONFIG += testcase
 SOURCES += ../tst_qdbusabstractinterface.cpp ../interface.cpp
 HEADERS += ../interface.h
 
@@ -9,5 +9,5 @@ HEADERS += ../pinger.h
 
 TARGET = ../tst_qdbusabstractinterface
 
-QT = core
+QT = core testlib
 QT += dbus
diff --git a/tests/auto/qdbustype/qdbustype.pro b/tests/auto/qdbustype/qdbustype.pro
index e2f0c90..159b531 100644
--- a/tests/auto/qdbustype/qdbustype.pro
+++ b/tests/auto/qdbustype/qdbustype.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT = core
+CONFIG += testcase
+TARGET = tst_qdbustype
+QT = core testlib
 contains(QT_CONFIG,dbus): {
         SOURCES += tst_qdbustype.cpp
         QT += dbus
diff --git a/tests/auto/qdebug/qdebug.pro b/tests/auto/qdebug/qdebug.pro
index 2b57168..b6a91a7 100644
--- a/tests/auto/qdebug/qdebug.pro
+++ b/tests/auto/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/qdirectpainter/runDirectPainter/runDirectPainter.pro b/tests/auto/qdirectpainter/runDirectPainter/runDirectPainter.pro
index 09524e9..5b70dc6 100644
--- a/tests/auto/qdirectpainter/runDirectPainter/runDirectPainter.pro
+++ b/tests/auto/qdirectpainter/runDirectPainter/runDirectPainter.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+QT += testlib
 SOURCES = main.cpp
 TARGET = runDirectPainter
 
diff --git a/tests/auto/qeasingcurve/qeasingcurve.pro b/tests/auto/qeasingcurve/qeasingcurve.pro
index 2a3a075..03d71bb 100644
--- a/tests/auto/qeasingcurve/qeasingcurve.pro
+++ b/tests/auto/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/qevent/qevent.pro b/tests/auto/qevent/qevent.pro
index 6042b6c..09d4395 100644
--- a/tests/auto/qevent/qevent.pro
+++ b/tests/auto/qevent/qevent.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qevent
 SOURCES += tst_qevent.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro b/tests/auto/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro
index cf574ff..9064d02 100644
--- a/tests/auto/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro
+++ b/tests/auto/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/qflags/qflags.pro b/tests/auto/qflags/qflags.pro
index 097a218..eeb204f 100644
--- a/tests/auto/qflags/qflags.pro
+++ b/tests/auto/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/qfontmetrics/qfontmetrics.pro b/tests/auto/qfontmetrics/qfontmetrics.pro
index c0dc1ab..a636651 100644
--- a/tests/auto/qfontmetrics/qfontmetrics.pro
+++ b/tests/auto/qfontmetrics/qfontmetrics.pro
@@ -1,4 +1,6 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qfontmetrics
+QT += testlib
 SOURCES  += tst_qfontmetrics.cpp
 RESOURCES += testfont.qrc
 
diff --git a/tests/auto/qgetputenv/qgetputenv.pro b/tests/auto/qgetputenv/qgetputenv.pro
index df94f14..ccfac7b 100644
--- a/tests/auto/qgetputenv/qgetputenv.pro
+++ b/tests/auto/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/qglobal/qglobal.pro b/tests/auto/qglobal/qglobal.pro
index a4dffac..b4bcf05 100644
--- a/tests/auto/qglobal/qglobal.pro
+++ b/tests/auto/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/qguivariant/qguivariant.pro b/tests/auto/qguivariant/qguivariant.pro
index 68082f0..9653d8e 100644
--- a/tests/auto/qguivariant/qguivariant.pro
+++ b/tests/auto/qguivariant/qguivariant.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qguivariant
 SOURCES  += tst_qguivariant.cpp
-
-
+QT += testlib
 
diff --git a/tests/auto/qimageiohandler/qimageiohandler.pro b/tests/auto/qimageiohandler/qimageiohandler.pro
index 46e5cfb..428ff62 100644
--- a/tests/auto/qimageiohandler/qimageiohandler.pro
+++ b/tests/auto/qimageiohandler/qimageiohandler.pro
@@ -1,8 +1,6 @@
-############################################################
-# Project file for autotest for file qimageiohandler.h
-############################################################
-
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qimageiohandler
+QT += testlib
 
 SOURCES += tst_qimageiohandler.cpp
 
diff --git a/tests/auto/qintvalidator/qintvalidator.pro b/tests/auto/qintvalidator/qintvalidator.pro
index 576621a..52e0b85 100644
--- a/tests/auto/qintvalidator/qintvalidator.pro
+++ b/tests/auto/qintvalidator/qintvalidator.pro
@@ -1,4 +1,4 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qintvalidator
 SOURCES += tst_qintvalidator.cpp
-
-
+QT += testlib
diff --git a/tests/auto/qmake/qmake.pro b/tests/auto/qmake/qmake.pro
index d0faa87..e78da4c 100644
--- a/tests/auto/qmake/qmake.pro
+++ b/tests/auto/qmake/qmake.pro
@@ -1,7 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qmake
 HEADERS += testcompiler.h
 SOURCES += tst_qmake.cpp testcompiler.cpp
-QT -= gui
+QT = core testlib
 
 cross_compile: DEFINES += QMAKE_CROSS_COMPILED
 
diff --git a/tests/auto/qmap/qmap.pro b/tests/auto/qmap/qmap.pro
index eaed926..fc4c84c 100644
--- a/tests/auto/qmap/qmap.pro
+++ b/tests/auto/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/qmargins/qmargins.pro b/tests/auto/qmargins/qmargins.pro
index 0404da0..02478c3 100644
--- a/tests/auto/qmargins/qmargins.pro
+++ b/tests/auto/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/qmath/qmath.pro b/tests/auto/qmath/qmath.pro
index e5784ce..90e61d7 100644
--- a/tests/auto/qmath/qmath.pro
+++ b/tests/auto/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/qmatrixnxn/qmatrixnxn.pro b/tests/auto/qmatrixnxn/qmatrixnxn.pro
index cf6e4a1..9c43d60 100644
--- a/tests/auto/qmatrixnxn/qmatrixnxn.pro
+++ b/tests/auto/qmatrixnxn/qmatrixnxn.pro
@@ -1,2 +1,4 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qmatrixnxn
 SOURCES += tst_qmatrixnxn.cpp
+QT += testlib
diff --git a/tests/auto/qmetatype/qmetatype.pro b/tests/auto/qmetatype/qmetatype.pro
index ed1de83..2841c5f 100644
--- a/tests/auto/qmetatype/qmetatype.pro
+++ b/tests/auto/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/qmimedata/qmimedata.pro b/tests/auto/qmimedata/qmimedata.pro
index 13fbe65..e4cf4ce 100644
--- a/tests/auto/qmimedata/qmimedata.pro
+++ b/tests/auto/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/qmutex/qmutex.pro b/tests/auto/qmutex/qmutex.pro
index 760dcfd..cf567c2 100644
--- a/tests/auto/qmutex/qmutex.pro
+++ b/tests/auto/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/qmutexlocker/qmutexlocker.pro b/tests/auto/qmutexlocker/qmutexlocker.pro
index 01c3691..9e44b5f 100644
--- a/tests/auto/qmutexlocker/qmutexlocker.pro
+++ b/tests/auto/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/qnumeric/qnumeric.pro b/tests/auto/qnumeric/qnumeric.pro
index c0af962..67b7a8d 100644
--- a/tests/auto/qnumeric/qnumeric.pro
+++ b/tests/auto/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/qobjectperformance/qobjectperformance.pro b/tests/auto/qobjectperformance/qobjectperformance.pro
index 0b4c5ee..189f8ee 100644
--- a/tests/auto/qobjectperformance/qobjectperformance.pro
+++ b/tests/auto/qobjectperformance/qobjectperformance.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qobjectperformance
 SOURCES  += tst_qobjectperformance.cpp
 
-QT = core network
+QT = core network testlib
 
 
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/qpaintengine/qpaintengine.pro b/tests/auto/qpaintengine/qpaintengine.pro
index e37c166..810dd81 100644
--- a/tests/auto/qpaintengine/qpaintengine.pro
+++ b/tests/auto/qpaintengine/qpaintengine.pro
@@ -1,9 +1,4 @@
-############################################################
-# Project file for autotest for file qpaintengine.h
-############################################################
-
-load(qttest_p4)
-
+CONFIG += testcase
+TARGET = tst_qpaintengine
 SOURCES += tst_qpaintengine.cpp
-
-
+QT += testlib
diff --git a/tests/auto/qpainterpath/qpainterpath.pro b/tests/auto/qpainterpath/qpainterpath.pro
index 9708222..0c0fe89 100644
--- a/tests/auto/qpainterpath/qpainterpath.pro
+++ b/tests/auto/qpainterpath/qpainterpath.pro
@@ -1,5 +1,4 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qpainterpath
 SOURCES  += tst_qpainterpath.cpp
-
-
-
+QT += testlib
diff --git a/tests/auto/qpainterpathstroker/qpainterpathstroker.pro b/tests/auto/qpainterpathstroker/qpainterpathstroker.pro
index b6f62a2..218183d 100644
--- a/tests/auto/qpainterpathstroker/qpainterpathstroker.pro
+++ b/tests/auto/qpainterpathstroker/qpainterpathstroker.pro
@@ -1,5 +1,4 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qpainterpathstroker
 SOURCES  += tst_qpainterpathstroker.cpp
-
-
-
+QT += testlib
diff --git a/tests/auto/qparallelanimationgroup/qparallelanimationgroup.pro b/tests/auto/qparallelanimationgroup/qparallelanimationgroup.pro
index f2cacd3..e18d17b 100644
--- a/tests/auto/qparallelanimationgroup/qparallelanimationgroup.pro
+++ b/tests/auto/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/qpen/qpen.pro b/tests/auto/qpen/qpen.pro
index 53bd5e2..762b8f4 100644
--- a/tests/auto/qpen/qpen.pro
+++ b/tests/auto/qpen/qpen.pro
@@ -1,5 +1,4 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qpen
 SOURCES  += tst_qpen.cpp
-
-
-
+QT += testlib
diff --git a/tests/auto/qpoint/qpoint.pro b/tests/auto/qpoint/qpoint.pro
index fd24046..cd501f6 100644
--- a/tests/auto/qpoint/qpoint.pro
+++ b/tests/auto/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/qprocessenvironment/qprocessenvironment.pro b/tests/auto/qprocessenvironment/qprocessenvironment.pro
index 60dba50..b05b8a5 100644
--- a/tests/auto/qprocessenvironment/qprocessenvironment.pro
+++ b/tests/auto/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/qquaternion/qquaternion.pro b/tests/auto/qquaternion/qquaternion.pro
index 6f740cf..f578a38 100644
--- a/tests/auto/qquaternion/qquaternion.pro
+++ b/tests/auto/qquaternion/qquaternion.pro
@@ -1,2 +1,4 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qquaternion
 SOURCES += tst_qquaternion.cpp
+QT += testlib
diff --git a/tests/auto/qqueue/qqueue.pro b/tests/auto/qqueue/qqueue.pro
index ce0d8c3..4a515d7 100644
--- a/tests/auto/qqueue/qqueue.pro
+++ b/tests/auto/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/qrand/qrand.pro b/tests/auto/qrand/qrand.pro
index 0db8af8..552592e 100644
--- a/tests/auto/qrand/qrand.pro
+++ b/tests/auto/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/qreadlocker/qreadlocker.pro b/tests/auto/qreadlocker/qreadlocker.pro
index ee53307..13cdf0c 100644
--- a/tests/auto/qreadlocker/qreadlocker.pro
+++ b/tests/auto/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/qreadwritelock/qreadwritelock.pro b/tests/auto/qreadwritelock/qreadwritelock.pro
index 93f7c68..c35023d 100644
--- a/tests/auto/qreadwritelock/qreadwritelock.pro
+++ b/tests/auto/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/qrect/qrect.pro b/tests/auto/qrect/qrect.pro
index f1ad046e..149d194 100644
--- a/tests/auto/qrect/qrect.pro
+++ b/tests/auto/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/qregexp/qregexp.pro b/tests/auto/qregexp/qregexp.pro
index e0fef12..9630235 100644
--- a/tests/auto/qregexp/qregexp.pro
+++ b/tests/auto/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/qregexpvalidator/qregexpvalidator.pro b/tests/auto/qregexpvalidator/qregexpvalidator.pro
index 68e5c51..8f1de5b 100644
--- a/tests/auto/qregexpvalidator/qregexpvalidator.pro
+++ b/tests/auto/qregexpvalidator/qregexpvalidator.pro
@@ -1,4 +1,4 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qregexpvalidator
 SOURCES += tst_qregexpvalidator.cpp
-
-
+QT += testlib
diff --git a/tests/auto/qscopedpointer/qscopedpointer.pro b/tests/auto/qscopedpointer/qscopedpointer.pro
index 4a3d5b8d..1aa5e33 100644
--- a/tests/auto/qscopedpointer/qscopedpointer.pro
+++ b/tests/auto/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/qscopedvaluerollback/qscopedvaluerollback.pro b/tests/auto/qscopedvaluerollback/qscopedvaluerollback.pro
index f06e21b..85aab77 100644
--- a/tests/auto/qscopedvaluerollback/qscopedvaluerollback.pro
+++ b/tests/auto/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/qsequentialanimationgroup/qsequentialanimationgroup.pro b/tests/auto/qsequentialanimationgroup/qsequentialanimationgroup.pro
index c0c10c0..810e0a7 100644
--- a/tests/auto/qsequentialanimationgroup/qsequentialanimationgroup.pro
+++ b/tests/auto/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/qsignalspy/qsignalspy.pro b/tests/auto/qsignalspy/qsignalspy.pro
index d3ae63b..72ae3a5 100644
--- a/tests/auto/qsignalspy/qsignalspy.pro
+++ b/tests/auto/qsignalspy/qsignalspy.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qsignalspy
 SOURCES  += tst_qsignalspy.cpp
-QT = core
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/qsize/qsize.pro b/tests/auto/qsize/qsize.pro
index a1814ac..140205b 100644
--- a/tests/auto/qsize/qsize.pro
+++ b/tests/auto/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/qsizef/qsizef.pro b/tests/auto/qsizef/qsizef.pro
index 5aa07d7..e0e9b0d 100644
--- a/tests/auto/qsizef/qsizef.pro
+++ b/tests/auto/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/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro b/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro
index 53020eb..0c26ee5 100644
--- a/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro
+++ b/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro
@@ -1,8 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
 
 SOURCES += tst_qsslsocket_onDemandCertificates_member.cpp
 !wince*:win32:LIBS += -lws2_32
-QT += network
+QT += network testlib
 QT -= gui
 
 TARGET = tst_qsslsocket_onDemandCertificates_member
@@ -10,7 +10,7 @@ TARGET = tst_qsslsocket_onDemandCertificates_member
 win32 {
   CONFIG(debug, debug|release) {
     DESTDIR = debug
-} else {
+  } else {
     DESTDIR = release
   }
 }
diff --git a/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro b/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro
index 3452a92..d4e7602 100644
--- a/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro
+++ b/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro
@@ -1,8 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
 
 SOURCES += tst_qsslsocket_onDemandCertificates_static.cpp
 !wince*:win32:LIBS += -lws2_32
-QT += network
+QT += network testlib
 QT -= gui
 
 TARGET = tst_qsslsocket_onDemandCertificates_static
@@ -10,7 +10,7 @@ TARGET = tst_qsslsocket_onDemandCertificates_static
 win32 {
   CONFIG(debug, debug|release) {
     DESTDIR = debug
-} else {
+  } else {
     DESTDIR = release
   }
 }
diff --git a/tests/auto/qstate/qstate.pro b/tests/auto/qstate/qstate.pro
index 6ee7e0c..243a696 100644
--- a/tests/auto/qstate/qstate.pro
+++ b/tests/auto/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/qstl/qstl.pro b/tests/auto/qstl/qstl.pro
index a0c9db1..128ee56 100644
--- a/tests/auto/qstl/qstl.pro
+++ b/tests/auto/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/qstringbuilder1/qstringbuilder1.pro b/tests/auto/qstringbuilder1/qstringbuilder1.pro
index dc9062f..1888450 100644
--- a/tests/auto/qstringbuilder1/qstringbuilder1.pro
+++ b/tests/auto/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/qstringbuilder2/qstringbuilder2.pro b/tests/auto/qstringbuilder2/qstringbuilder2.pro
index a57c6f1..8a1554d 100644
--- a/tests/auto/qstringbuilder2/qstringbuilder2.pro
+++ b/tests/auto/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/qstringbuilder3/qstringbuilder3.pro b/tests/auto/qstringbuilder3/qstringbuilder3.pro
index 5aced7c..00e64ee 100644
--- a/tests/auto/qstringbuilder3/qstringbuilder3.pro
+++ b/tests/auto/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/qstringbuilder4/qstringbuilder4.pro b/tests/auto/qstringbuilder4/qstringbuilder4.pro
index 0532a9b..ef7893c 100644
--- a/tests/auto/qstringbuilder4/qstringbuilder4.pro
+++ b/tests/auto/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/qstringlist/qstringlist.pro b/tests/auto/qstringlist/qstringlist.pro
index d82a348..73b8559 100644
--- a/tests/auto/qstringlist/qstringlist.pro
+++ b/tests/auto/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/qstringmatcher/qstringmatcher.pro b/tests/auto/qstringmatcher/qstringmatcher.pro
index c5249ec..0599163 100644
--- a/tests/auto/qstringmatcher/qstringmatcher.pro
+++ b/tests/auto/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/qstringref/qstringref.pro b/tests/auto/qstringref/qstringref.pro
index 34f2de4..7aa5f38 100644
--- a/tests/auto/qstringref/qstringref.pro
+++ b/tests/auto/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/qsyntaxhighlighter/qsyntaxhighlighter.pro b/tests/auto/qsyntaxhighlighter/qsyntaxhighlighter.pro
index 30fb3a5..14f5add 100644
--- a/tests/auto/qsyntaxhighlighter/qsyntaxhighlighter.pro
+++ b/tests/auto/qsyntaxhighlighter/qsyntaxhighlighter.pro
@@ -1,4 +1,4 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qsyntaxhighlighter
 SOURCES += tst_qsyntaxhighlighter.cpp
-
-
+QT += testlib
diff --git a/tests/auto/qtextcursor/qtextcursor.pro b/tests/auto/qtextcursor/qtextcursor.pro
index 828b90c..bae85d9 100644
--- a/tests/auto/qtextcursor/qtextcursor.pro
+++ b/tests/auto/qtextcursor/qtextcursor.pro
@@ -1,5 +1,4 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qtextcursor
 SOURCES  += tst_qtextcursor.cpp
-
-
-
+QT += testlib
diff --git a/tests/auto/qtextformat/qtextformat.pro b/tests/auto/qtextformat/qtextformat.pro
index 30f6e50..f810a3b 100644
--- a/tests/auto/qtextformat/qtextformat.pro
+++ b/tests/auto/qtextformat/qtextformat.pro
@@ -1,9 +1,4 @@
-############################################################
-# Project file for autotest for file qtextformat.h
-############################################################
-
-load(qttest_p4)
-
+CONFIG += testcase
+TARGET = tst_qtextformat
+QT += testlib
 SOURCES += tst_qtextformat.cpp
-
-
diff --git a/tests/auto/qthreadonce/qthreadonce.pro b/tests/auto/qthreadonce/qthreadonce.pro
index d7ef4d4..cd97917 100644
--- a/tests/auto/qthreadonce/qthreadonce.pro
+++ b/tests/auto/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/qthreadpool/qthreadpool.pro b/tests/auto/qthreadpool/qthreadpool.pro
index dbaeb20..df13d5f 100644
--- a/tests/auto/qthreadpool/qthreadpool.pro
+++ b/tests/auto/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/qthreadstorage/tst_qthreadstorage.pro b/tests/auto/qthreadstorage/tst_qthreadstorage.pro
index 3071098..791582f 100644
--- a/tests/auto/qthreadstorage/tst_qthreadstorage.pro
+++ b/tests/auto/qthreadstorage/tst_qthreadstorage.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
-SOURCES += tst_qthreadstorage.cpp
-QT = core
+CONFIG += testcase
+TARGET = tst_qthreadstorage
+QT = core testlib
+SOURCES = tst_qthreadstorage.cpp
 symbian:LIBS += -llibpthread
diff --git a/tests/auto/qtime/qtime.pro b/tests/auto/qtime/qtime.pro
index ce4f7ae..bc2c58c 100644
--- a/tests/auto/qtime/qtime.pro
+++ b/tests/auto/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/qtimeline/qtimeline.pro b/tests/auto/qtimeline/qtimeline.pro
index 9be717d..6dfd22a 100644
--- a/tests/auto/qtimeline/qtimeline.pro
+++ b/tests/auto/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/qtimer/qtimer.pro b/tests/auto/qtimer/qtimer.pro
index 086df1d..1b24228 100644
--- a/tests/auto/qtimer/qtimer.pro
+++ b/tests/auto/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/qtokenautomaton/qtokenautomaton.pro b/tests/auto/qtokenautomaton/qtokenautomaton.pro
index 5e2e590..a4af4bc 100644
--- a/tests/auto/qtokenautomaton/qtokenautomaton.pro
+++ b/tests/auto/qtokenautomaton/qtokenautomaton.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qtokenautomaton
 SOURCES += tst_qtokenautomaton.cpp                      \
            tokenizers/basic/basic.cpp                   \
            tokenizers/basicNamespace/basicNamespace.cpp \
@@ -14,5 +15,5 @@ HEADERS += tokenizers/basic/basic.h                     \
            tokenizers/noToString/noToString.h           \
            tokenizers/withNamespace/withNamespace.h
 
-QT -= gui
+QT = core testlib
 CONFIG += parallel_test
diff --git a/tests/auto/qtransformedscreen/qtransformedscreen.pro b/tests/auto/qtransformedscreen/qtransformedscreen.pro
index 6914054..daea2dd 100644
--- a/tests/auto/qtransformedscreen/qtransformedscreen.pro
+++ b/tests/auto/qtransformedscreen/qtransformedscreen.pro
@@ -1,5 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qtransformedscreen
 SOURCES += tst_qtransformedscreen.cpp
+QT += testlib
 
 embedded:!contains(gfx-drivers, transformed) {
 LIBS += ../../../plugins/gfxdrivers/libqgfxtransformed.so
diff --git a/tests/auto/qurl/qurl.pro b/tests/auto/qurl/qurl.pro
index a5c39a5..01dbf52 100644
--- a/tests/auto/qurl/qurl.pro
+++ b/tests/auto/qurl/qurl.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-SOURCES  += tst_qurl.cpp
-QT = core
+CONFIG += testcase
+TARGET = tst_qurl
+QT = core testlib
+SOURCES = tst_qurl.cpp
 symbian: TARGET.CAPABILITY = NetworkServices
 CONFIG += parallel_test
diff --git a/tests/auto/qvarlengtharray/qvarlengtharray.pro b/tests/auto/qvarlengtharray/qvarlengtharray.pro
index 183da1b..cb1cb38 100644
--- a/tests/auto/qvarlengtharray/qvarlengtharray.pro
+++ b/tests/auto/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/qvector/qvector.pro b/tests/auto/qvector/qvector.pro
index a7c3957..12efcc6 100644
--- a/tests/auto/qvector/qvector.pro
+++ b/tests/auto/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/qvectornd/qvectornd.pro b/tests/auto/qvectornd/qvectornd.pro
index 6346199..9e5155a 100644
--- a/tests/auto/qvectornd/qvectornd.pro
+++ b/tests/auto/qvectornd/qvectornd.pro
@@ -1,2 +1,4 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qvectornd
 SOURCES += tst_qvectornd.cpp
+QT += testlib
diff --git a/tests/auto/qwaitcondition/qwaitcondition.pro b/tests/auto/qwaitcondition/qwaitcondition.pro
index 9af0c71..b9cf3af 100644
--- a/tests/auto/qwaitcondition/qwaitcondition.pro
+++ b/tests/auto/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/qwindowsurface/qwindowsurface.pro b/tests/auto/qwindowsurface/qwindowsurface.pro
index e5686be..83b2a6d 100644
--- a/tests/auto/qwindowsurface/qwindowsurface.pro
+++ b/tests/auto/qwindowsurface/qwindowsurface.pro
@@ -1,5 +1,7 @@
-load(qttest_p4)
-SOURCES += tst_qwindowsurface.cpp
-
+CONFIG += testcase
+TARGET = tst_qwindowsurface
 
+QT += widgets widgets-private testlib
+QT += gui-private
 
+SOURCES += tst_qwindowsurface.cpp
diff --git a/tests/auto/qwritelocker/qwritelocker.pro b/tests/auto/qwritelocker/qwritelocker.pro
index 39a98aa..946e75c 100644
--- a/tests/auto/qwritelocker/qwritelocker.pro
+++ b/tests/auto/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/qwsembedwidget/qwsembedwidget.pro b/tests/auto/qwsembedwidget/qwsembedwidget.pro
index c34212b..97cbf94 100644
--- a/tests/auto/qwsembedwidget/qwsembedwidget.pro
+++ b/tests/auto/qwsembedwidget/qwsembedwidget.pro
@@ -1,2 +1,4 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qwsembedwidget
+QT += widgets testlib
 SOURCES += tst_qwsembedwidget.cpp
diff --git a/tests/auto/qwsinputmethod/qwsinputmethod.pro b/tests/auto/qwsinputmethod/qwsinputmethod.pro
index d549de0..83ea7f2 100644
--- a/tests/auto/qwsinputmethod/qwsinputmethod.pro
+++ b/tests/auto/qwsinputmethod/qwsinputmethod.pro
@@ -1,2 +1,4 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qwsinputmethod
+QT += testlib
 SOURCES += tst_qwsinputmethod.cpp
diff --git a/tests/auto/qwswindowsystem/qwswindowsystem.pro b/tests/auto/qwswindowsystem/qwswindowsystem.pro
index ee33935..41aa1ae 100644
--- a/tests/auto/qwswindowsystem/qwswindowsystem.pro
+++ b/tests/auto/qwswindowsystem/qwswindowsystem.pro
@@ -1,2 +1,4 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qwswindowsystem
+QT += testlib
 SOURCES += tst_qwswindowsystem.cpp
diff --git a/tests/auto/qx11info/qx11info.pro b/tests/auto/qx11info/qx11info.pro
index e87fcf5..3782644 100644
--- a/tests/auto/qx11info/qx11info.pro
+++ b/tests/auto/qx11info/qx11info.pro
@@ -1,4 +1,4 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qx11info
+QT += widgets testlib
 SOURCES += tst_qx11info.cpp
-
-
diff --git a/tests/auto/qxmlinputsource/qxmlinputsource.pro b/tests/auto/qxmlinputsource/qxmlinputsource.pro
index ec83f47..a8bf834 100644
--- a/tests/auto/qxmlinputsource/qxmlinputsource.pro
+++ b/tests/auto/qxmlinputsource/qxmlinputsource.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qxmlinputsource
 SOURCES  += tst_qxmlinputsource.cpp
-QT += core xml network
+QT += core xml network testlib
 QT -= gui
 
 
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
diff --git a/tests/manual/network_remote_stresstest/network_remote_stresstest.pro b/tests/manual/network_remote_stresstest/network_remote_stresstest.pro
index 9ed1090..3a581e1 100644
--- a/tests/manual/network_remote_stresstest/network_remote_stresstest.pro
+++ b/tests/manual/network_remote_stresstest/network_remote_stresstest.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_network_remote_stresstest
 
-QT = core network
+QT = core network testlib
 
 SOURCES  += tst_network_remote_stresstest.cpp
 
diff --git a/tests/manual/network_stresstest/network_stresstest.pro b/tests/manual/network_stresstest/network_stresstest.pro
index 0e272d1..caa8436 100644
--- a/tests/manual/network_stresstest/network_stresstest.pro
+++ b/tests/manual/network_stresstest/network_stresstest.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_network_stresstest
 
-QT = core network
+QT = core network testlib
 
 SOURCES  += tst_network_stresstest.cpp \
     minihttpserver.cpp
diff --git a/tests/manual/qhttpnetworkconnection/qhttpnetworkconnection.pro b/tests/manual/qhttpnetworkconnection/qhttpnetworkconnection.pro
index 2471389..d73124c 100644
--- a/tests/manual/qhttpnetworkconnection/qhttpnetworkconnection.pro
+++ b/tests/manual/qhttpnetworkconnection/qhttpnetworkconnection.pro
@@ -1,11 +1,11 @@
-load(qttest_p4)
+CONFIG += testcase
 TEMPLATE = app
 TARGET = tst_qhttpnetworkconnection
 DEPENDPATH += .
 INCLUDEPATH += .
 
 QT -= gui
-QT += network
+QT += network testlib
 
 CONFIG += release
 
diff --git a/tests/manual/qnetworkreply/qnetworkreply.pro b/tests/manual/qnetworkreply/qnetworkreply.pro
index 060acf5..479a1e6 100644
--- a/tests/manual/qnetworkreply/qnetworkreply.pro
+++ b/tests/manual/qnetworkreply/qnetworkreply.pro
@@ -1,11 +1,11 @@
-load(qttest_p4)
+CONFIG += testcase
 TEMPLATE = app
 TARGET = tst_qnetworkreply
 DEPENDPATH += .
 INCLUDEPATH += .
 
 QT -= gui
-QT += network
+QT += network testlib
 
 CONFIG += release
 
diff --git a/tests/manual/qssloptions/qssloptions.pro b/tests/manual/qssloptions/qssloptions.pro
index c1c8446..3fcb696 100644
--- a/tests/manual/qssloptions/qssloptions.pro
+++ b/tests/manual/qssloptions/qssloptions.pro
@@ -1,11 +1,11 @@
-load(qttest_p4)
+CONFIG += testcase
 TEMPLATE = app
 TARGET = tst_qssloptions
 DEPENDPATH += .
 INCLUDEPATH += .
 
 QT -= gui
-QT += network
+QT += network testlib
 
 #CONFIG += release
 
diff --git a/tests/manual/socketengine/socketengine.pro b/tests/manual/socketengine/socketengine.pro
index 76a40be..74facf7 100644
--- a/tests/manual/socketengine/socketengine.pro
+++ b/tests/manual/socketengine/socketengine.pro
@@ -1,11 +1,11 @@
-load(qttest_p4)
+CONFIG += testcase
 TEMPLATE = app
 TARGET = tst_socketengine
 DEPENDPATH += .
 INCLUDEPATH += .
 
 QT -= gui
-QT += network
+QT += network testlib
 
 CONFIG += release