summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@nokia.com>2011-10-25 11:26:19 +1000
committerSergio Ahumada <sergio.ahumada@nokia.com>2011-12-25 22:10:00 +0100
commit45335cba963c41ab73d471ee1c18e37dd6b2a5b8 (patch)
tree5860e44d7e156370257ce3fb92ad9864ed042ece
parent1ac559f5ea335de5d78bef8d991133b95081a1b7 (diff)
downloadqt4-tools-45335cba963c41ab73d471ee1c18e37dd6b2a5b8.tar.gz
tests: eliminated usage of qttest_p4.prf
qttest_p4.prf was added as a convenience for Qt's own autotests in Qt4. It enables various crufty undocumented magic, of dubious value. Stop using it, and explicitly enable the things from it which we want. Change-Id: If1f16810614f7965dc7d5bf680effed911bee114 Reviewed-by: Jason McDonald
-rw-r--r--tests/auto/collections/collections.pro5
-rw-r--r--tests/auto/compiler/compiler.pro5
-rw-r--r--tests/auto/exceptionsafety/exceptionsafety.pro5
-rw-r--r--tests/auto/macplist/app/app.pro4
-rw-r--r--tests/auto/macplist/test/test.pro3
-rw-r--r--tests/auto/q_func_info/q_func_info.pro5
-rw-r--r--tests/auto/qabstractfileengine/qabstractfileengine.pro5
-rw-r--r--tests/auto/qanimationgroup/qanimationgroup.pro5
-rw-r--r--tests/auto/qatomicint/qatomicint.pro5
-rw-r--r--tests/auto/qatomicpointer/qatomicpointer.pro5
-rw-r--r--tests/auto/qbitarray/qbitarray.pro5
-rw-r--r--tests/auto/qbuffer/qbuffer.pro5
-rw-r--r--tests/auto/qbytearraymatcher/qbytearraymatcher.pro5
-rw-r--r--tests/auto/qcache/qcache.pro5
-rw-r--r--tests/auto/qcolor/qcolor.pro7
-rw-r--r--tests/auto/qcoreapplication/qcoreapplication.pro5
-rw-r--r--tests/auto/qdate/qdate.pro5
-rw-r--r--tests/auto/qdbusabstractinterface/test/test.pro4
-rw-r--r--tests/auto/qdbustype/qdbustype.pro5
-rw-r--r--tests/auto/qdebug/qdebug.pro5
-rw-r--r--tests/auto/qdirectpainter/runDirectPainter/runDirectPainter.pro3
-rw-r--r--tests/auto/qeasingcurve/qeasingcurve.pro5
-rw-r--r--tests/auto/qevent/qevent.pro5
-rw-r--r--tests/auto/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro5
-rw-r--r--tests/auto/qflags/qflags.pro5
-rw-r--r--tests/auto/qfontmetrics/qfontmetrics.pro4
-rw-r--r--tests/auto/qgetputenv/qgetputenv.pro5
-rw-r--r--tests/auto/qglobal/qglobal.pro5
-rw-r--r--tests/auto/qguivariant/qguivariant.pro6
-rw-r--r--tests/auto/qimageiohandler/qimageiohandler.pro8
-rw-r--r--tests/auto/qintvalidator/qintvalidator.pro6
-rw-r--r--tests/auto/qmake/qmake.pro5
-rw-r--r--tests/auto/qmap/qmap.pro6
-rw-r--r--tests/auto/qmargins/qmargins.pro5
-rw-r--r--tests/auto/qmath/qmath.pro6
-rw-r--r--tests/auto/qmatrixnxn/qmatrixnxn.pro4
-rw-r--r--tests/auto/qmetatype/qmetatype.pro5
-rw-r--r--tests/auto/qmimedata/qmimedata.pro5
-rw-r--r--tests/auto/qmutex/qmutex.pro5
-rw-r--r--tests/auto/qmutexlocker/qmutexlocker.pro5
-rw-r--r--tests/auto/qnumeric/qnumeric.pro6
-rw-r--r--tests/auto/qobjectperformance/qobjectperformance.pro5
-rw-r--r--tests/auto/qobjectrace/qobjectrace.pro4
-rw-r--r--tests/auto/qpaintengine/qpaintengine.pro11
-rw-r--r--tests/auto/qpainterpath/qpainterpath.pro7
-rw-r--r--tests/auto/qpainterpathstroker/qpainterpathstroker.pro7
-rw-r--r--tests/auto/qparallelanimationgroup/qparallelanimationgroup.pro5
-rw-r--r--tests/auto/qpen/qpen.pro7
-rw-r--r--tests/auto/qpoint/qpoint.pro5
-rw-r--r--tests/auto/qprocessenvironment/qprocessenvironment.pro5
-rw-r--r--tests/auto/qquaternion/qquaternion.pro4
-rw-r--r--tests/auto/qqueue/qqueue.pro6
-rw-r--r--tests/auto/qrand/qrand.pro5
-rw-r--r--tests/auto/qreadlocker/qreadlocker.pro5
-rw-r--r--tests/auto/qreadwritelock/qreadwritelock.pro5
-rw-r--r--tests/auto/qrect/qrect.pro5
-rw-r--r--tests/auto/qregexp/qregexp.pro8
-rw-r--r--tests/auto/qregexpvalidator/qregexpvalidator.pro6
-rw-r--r--tests/auto/qscopedpointer/qscopedpointer.pro5
-rw-r--r--tests/auto/qscopedvaluerollback/qscopedvaluerollback.pro5
-rw-r--r--tests/auto/qsequentialanimationgroup/qsequentialanimationgroup.pro5
-rw-r--r--tests/auto/qsignalspy/qsignalspy.pro5
-rw-r--r--tests/auto/qsize/qsize.pro5
-rw-r--r--tests/auto/qsizef/qsizef.pro5
-rw-r--r--tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro6
-rw-r--r--tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro6
-rw-r--r--tests/auto/qstate/qstate.pro5
-rw-r--r--tests/auto/qstl/qstl.pro5
-rw-r--r--tests/auto/qstringbuilder1/qstringbuilder1.pro5
-rw-r--r--tests/auto/qstringbuilder2/qstringbuilder2.pro5
-rw-r--r--tests/auto/qstringbuilder3/qstringbuilder3.pro5
-rw-r--r--tests/auto/qstringbuilder4/qstringbuilder4.pro5
-rw-r--r--tests/auto/qstringlist/qstringlist.pro5
-rw-r--r--tests/auto/qstringmatcher/qstringmatcher.pro5
-rw-r--r--tests/auto/qstringref/qstringref.pro5
-rw-r--r--tests/auto/qsyntaxhighlighter/qsyntaxhighlighter.pro6
-rw-r--r--tests/auto/qtextcursor/qtextcursor.pro7
-rw-r--r--tests/auto/qtextformat/qtextformat.pro11
-rw-r--r--tests/auto/qthreadonce/qthreadonce.pro5
-rw-r--r--tests/auto/qthreadpool/qthreadpool.pro5
-rw-r--r--tests/auto/qthreadstorage/tst_qthreadstorage.pro7
-rw-r--r--tests/auto/qtime/qtime.pro5
-rw-r--r--tests/auto/qtimeline/qtimeline.pro6
-rw-r--r--tests/auto/qtimer/qtimer.pro6
-rw-r--r--tests/auto/qtokenautomaton/qtokenautomaton.pro5
-rw-r--r--tests/auto/qtransformedscreen/qtransformedscreen.pro4
-rw-r--r--tests/auto/qurl/qurl.pro7
-rw-r--r--tests/auto/qvarlengtharray/qvarlengtharray.pro6
-rw-r--r--tests/auto/qvector/qvector.pro5
-rw-r--r--tests/auto/qvectornd/qvectornd.pro4
-rw-r--r--tests/auto/qwaitcondition/qwaitcondition.pro5
-rw-r--r--tests/auto/qwindowsurface/qwindowsurface.pro8
-rw-r--r--tests/auto/qwritelocker/qwritelocker.pro5
-rw-r--r--tests/auto/qwsembedwidget/qwsembedwidget.pro4
-rw-r--r--tests/auto/qwsinputmethod/qwsinputmethod.pro4
-rw-r--r--tests/auto/qwswindowsystem/qwswindowsystem.pro4
-rw-r--r--tests/auto/qx11info/qx11info.pro6
-rw-r--r--tests/auto/qxmlinputsource/qxmlinputsource.pro5
-rw-r--r--tests/auto/utf8/utf8.pro5
-rw-r--r--tests/manual/network_remote_stresstest/network_remote_stresstest.pro5
-rw-r--r--tests/manual/network_stresstest/network_stresstest.pro5
-rw-r--r--tests/manual/qhttpnetworkconnection/qhttpnetworkconnection.pro4
-rw-r--r--tests/manual/qnetworkreply/qnetworkreply.pro4
-rw-r--r--tests/manual/qssloptions/qssloptions.pro4
-rw-r--r--tests/manual/socketengine/socketengine.pro4
105 files changed, 308 insertions, 247 deletions
diff --git a/tests/auto/collections/collections.pro b/tests/auto/collections/collections.pro
index 8601ff877d..364ae21858 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 c444c63af6..e6307ac9ec 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 52ba9e27bd..66abe49758 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 c1cf52e0ef..6a976cbbf9 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 4751b47e00..5018abeca9 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 64f08d4d8d..d657fd80ee 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 870473a4cb..d498b530bc 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 5e1be0cb10..179412a387 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 7850d93dc7..dd18c7d6db 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 89ff137d39..dc6c54a2da 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 358d81bad1..528ea58bbd 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 b768eb82d8..9745fcd862 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 a2458e623f..a90511d889 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 0da4e1414f..bd2a683da2 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 b9d437ef7c..7dba0cec99 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 031af39df7..33ac65d9ee 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 1c041004d3..749c65e1f5 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 98bcaa70f5..aba7f57b20 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 e2f0c9017c..159b53102f 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 2b5716860c..b6a91a7703 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 09524e90c3..5b70dc6b7b 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 2a3a075d8a..03d71bb6d9 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 6042b6cdc9..09d4395f4d 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 cf574ffc40..9064d0263a 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 097a218a5a..eeb204f51f 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 c0dc1abbe6..a636651724 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 df94f14473..ccfac7b8a7 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 a4dffac815..b4bcf0524f 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 68082f0037..9653d8e455 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 46e5cfb2cf..428ff62959 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 576621a08b..52e0b85735 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 d0faa872b8..e78da4c0a0 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 eaed926481..fc4c84c58d 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 0404da0424..02478c3f61 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 e5784ce7aa..90e61d7132 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 cf6e4a128e..9c43d6068d 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 ed1de83927..2841c5f139 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 13fbe65edc..e4cf4ce1a6 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 760dcfd2d8..cf567c2f65 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 01c369101b..9e44b5f84c 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 c0af962a79..67b7a8de65 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 0b4c5ee541..189f8eeb2a 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 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/qpaintengine/qpaintengine.pro b/tests/auto/qpaintengine/qpaintengine.pro
index e37c1668ac..810dd81311 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 9708222c99..0c0fe8951a 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 b6f62a2eee..218183da3d 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 f2cacd3452..e18d17b4f8 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 53bd5e2b6e..762b8f47d4 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 fd240461e2..cd501f648c 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 60dba50813..b05b8a5265 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 6f740cfd42..f578a38580 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 ce0d8c30ca..4a515d719d 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 0db8af821c..552592e2e4 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 ee533070a7..13cdf0c58b 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 93f7c68dc3..c35023d46e 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 f1ad046e34..149d194e21 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 e0fef12479..96302354db 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 68e5c51677..8f1de5b747 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 4a3d5b8de8..1aa5e33ad2 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 f06e21ba1f..85aab77e91 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 c0c10c054d..810e0a7bb8 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 d3ae63b5bc..72ae3a5009 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 a1814ac8c5..140205bd6b 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 5aa07d72a1..e0e9b0d43a 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 53020eb892..0c26ee511c 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 3452a92fe2..d4e7602900 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 6ee7e0cd00..243a6963a5 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 a0c9db1dfc..128ee562cc 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 dc9062f4da..1888450699 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 a57c6f19f2..8a1554da9e 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 5aced7c258..00e64eee5c 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 0532a9b925..ef7893c977 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 d82a3487fd..73b8559360 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 c5249ec84a..059916365e 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 34f2de46ae..7aa5f38001 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 30fb3a5283..14f5add8cc 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 828b90ca16..bae85d9c37 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 30f6e50c61..f810a3bb64 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 d7ef4d4c23..cd97917165 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 dbaeb208dd..df13d5f82f 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 3071098629..791582fe74 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 ce4f7ae91f..bc2c58cacd 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 9be717dba8..6dfd22af95 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 086df1dd18..1b2422826d 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 5e2e590a4b..a4af4bc1c5 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 6914054de3..daea2dd09f 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 a5c39a5a98..01dbf52a7c 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 183da1b938..cb1cb38a57 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 a7c3957f2c..12efcc63a8 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 6346199444..9e5155aa6f 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 9af0c71301..b9cf3af5b3 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 e5686beb6a..83b2a6d887 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 39a98aaba5..946e75ca06 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 c34212b06a..97cbf94bf2 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 d549de0126..83ea7f22f3 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 ee33935ea5..41aa1aea9d 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 e87fcf553f..3782644930 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 ec83f4729a..a8bf834074 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 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
diff --git a/tests/manual/network_remote_stresstest/network_remote_stresstest.pro b/tests/manual/network_remote_stresstest/network_remote_stresstest.pro
index 9ed1090533..3a581e12ad 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 0e272d1485..caa8436cef 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 2471389ba1..d73124c8f9 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 060acf53dc..479a1e63bc 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 c1c8446e0f..3fcb696cd0 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 76a40be8e3..74facf789a 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