Merge remote branch 'dev-codereview/4.8' into qa-staging-master

98 files changed, 411 insertions, 328 deletions

diff --git a/tests/auto/checkxmlfiles/checkxmlfiles.pro b/tests/auto/checkxmlfiles/checkxmlfiles.pro
index ab932f5..5bbfd6c 100644
--- a/tests/auto/checkxmlfiles/checkxmlfiles.pro
+++ b/tests/auto/checkxmlfiles/checkxmlfiles.pro
@@ -1,8 +1,9 @@
-load(qttest_p4)
+CONFIG += testcase
+
+TARGET = tst_checkxmlfiles
+QT = core testlib
 SOURCES += tst_checkxmlfiles.cpp \
            ../qxmlquery/TestFundament.cpp
-CONFIG += qtestlib
-QT -= gui
 
 include (../xmlpatterns.pri)
 
diff --git a/tests/auto/exceptionsafety_objects/exceptionsafety_objects.pro b/tests/auto/exceptionsafety_objects/exceptionsafety_objects.pro
index 9ef634e..7912f83 100644
--- a/tests/auto/exceptionsafety_objects/exceptionsafety_objects.pro
+++ b/tests/auto/exceptionsafety_objects/exceptionsafety_objects.pro
@@ -1,5 +1,8 @@
-load(qttest_p4)
-HEADERS += oomsimulator.h 3rdparty/valgrind.h 3rdparty/memcheck.h
+CONFIG += testcase
+
+TARGET = tst_exceptionsafety_objects
+QT += testlib
 SOURCES += tst_exceptionsafety_objects.cpp
+HEADERS += oomsimulator.h 3rdparty/valgrind.h 3rdparty/memcheck.h
 
 CONFIG+=insignificant_test # QTQAINFRA-428
diff --git a/tests/auto/headers/headers.pro b/tests/auto/headers/headers.pro
index 4bc02fe..a143506 100644
--- a/tests/auto/headers/headers.pro
+++ b/tests/auto/headers/headers.pro
@@ -1,5 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+
+TARGET = tst_headers
+QT = core testlib
 SOURCES  += tst_headers.cpp headersclean.cpp
-QT = core
 
 CONFIG+=insignificant_test # QTQAINFRA-428
diff --git a/tests/auto/moc/moc.pro b/tests/auto/moc/moc.pro
index 4fb9ac4..f360a0b 100644
--- a/tests/auto/moc/moc.pro
+++ b/tests/auto/moc/moc.pro
@@ -1,4 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
+
+TARGET = tst_moc
+QT += sql network svg testlib
+SOURCES += tst_moc.cpp
 
 #exists(/usr/include/boost/spirit.hpp) {
 #    message("including boost headers in test")
@@ -18,14 +22,10 @@ HEADERS += using-namespaces.h no-keywords.h task87883.h c-comments.h backslash-n
            dir-in-include-path.h single_function_keyword.h task192552.h task189996.h \
            task234909.h task240368.h pure-virtual-signals.h
 if(*-g++*|*-icc*|*-clang|*-llvm):!irix-*:!win32-*: HEADERS += os9-newlines.h win-newlines.h
-SOURCES += tst_moc.cpp
 
-QT += sql network svg
 contains(QT_CONFIG, script): QT += script
 contains(QT_CONFIG, qt3support): QT += qt3support
-contains(QT_CONFIG, dbus){
+contains(QT_CONFIG, dbus) {
     DEFINES += WITH_DBUS
     QT += dbus
 }
-
-
diff --git a/tests/auto/patternistexamplefiletree/patternistexamplefiletree.pro b/tests/auto/patternistexamplefiletree/patternistexamplefiletree.pro
index 772c833..d6b8c13 100644
--- a/tests/auto/patternistexamplefiletree/patternistexamplefiletree.pro
+++ b/tests/auto/patternistexamplefiletree/patternistexamplefiletree.pro
@@ -1,5 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+
+TARGET = tst_patternistexamplefiletree
+QT = core testlib
 SOURCES += tst_patternistexamplefiletree.cpp
-QT = core
 
 include (../xmlpatterns.pri)
diff --git a/tests/auto/patternistheaders/patternistheaders.pro b/tests/auto/patternistheaders/patternistheaders.pro
index fe4d670..39a653f 100644
--- a/tests/auto/patternistheaders/patternistheaders.pro
+++ b/tests/auto/patternistheaders/patternistheaders.pro
@@ -1,5 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+
+TARGET = tst_patternistheaders
+QT = core testlib
 SOURCES += tst_patternistheaders.cpp
-QT = core
 
 include (../xmlpatterns.pri)
diff --git a/tests/auto/qabstractbutton/qabstractbutton.pro b/tests/auto/qabstractbutton/qabstractbutton.pro
index 2e52585..ffc34df 100644
--- a/tests/auto/qabstractbutton/qabstractbutton.pro
+++ b/tests/auto/qabstractbutton/qabstractbutton.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
-SOURCES  += tst_qabstractbutton.cpp
-
+CONFIG += testcase
 
+TARGET = tst_qabstractbutton
+QT += testlib
+SOURCES  += tst_qabstractbutton.cpp
diff --git a/tests/auto/qabstractitemmodel/qabstractitemmodel.pro b/tests/auto/qabstractitemmodel/qabstractitemmodel.pro
index 52c4e96..f8893ba 100644
--- a/tests/auto/qabstractitemmodel/qabstractitemmodel.pro
+++ b/tests/auto/qabstractitemmodel/qabstractitemmodel.pro
@@ -1,9 +1,8 @@
-load(qttest_p4)
-
-INCLUDEPATH += $$PWD/../modeltest
-
-SOURCES         += tst_qabstractitemmodel.cpp ../modeltest/dynamictreemodel.cpp ../modeltest/modeltest.cpp
-HEADERS         += ../modeltest/dynamictreemodel.h ../modeltest/modeltest.h
-
+CONFIG += testcase
 
+TARGET = tst_qabstractitemmodel
+QT += testlib
+SOURCES += tst_qabstractitemmodel.cpp ../modeltest/dynamictreemodel.cpp ../modeltest/modeltest.cpp
 
+INCLUDEPATH += $$PWD/../modeltest
+HEADERS     += ../modeltest/dynamictreemodel.h ../modeltest/modeltest.h
diff --git a/tests/auto/qabstractproxymodel/qabstractproxymodel.pro b/tests/auto/qabstractproxymodel/qabstractproxymodel.pro
index d1bff92..f5dd43c 100644
--- a/tests/auto/qabstractproxymodel/qabstractproxymodel.pro
+++ b/tests/auto/qabstractproxymodel/qabstractproxymodel.pro
@@ -1,2 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+
+TARGET = tst_qabstractproxymodel
+QT += testlib
 SOURCES  += tst_qabstractproxymodel.cpp
diff --git a/tests/auto/qabstractvideobuffer/qabstractvideobuffer.pro b/tests/auto/qabstractvideobuffer/qabstractvideobuffer.pro
index 080719a..8437274 100644
--- a/tests/auto/qabstractvideobuffer/qabstractvideobuffer.pro
+++ b/tests/auto/qabstractvideobuffer/qabstractvideobuffer.pro
@@ -1,5 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+
+TARGET = tst_qabstractvideobuffer
+QT += multimedia testlib
 SOURCES += tst_qabstractvideobuffer.cpp
 
-QT += multimedia
 requires(contains(QT_CONFIG, multimedia))
diff --git a/tests/auto/qabstractxmlforwarditerator/qabstractxmlforwarditerator.pro b/tests/auto/qabstractxmlforwarditerator/qabstractxmlforwarditerator.pro
index 6bc0c59..ba75b37 100644
--- a/tests/auto/qabstractxmlforwarditerator/qabstractxmlforwarditerator.pro
+++ b/tests/auto/qabstractxmlforwarditerator/qabstractxmlforwarditerator.pro
@@ -1,5 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+
+TARGET = tst_qabstractxmlforwarditerator
+QT = core testlib
 SOURCES += tst_qabstractxmlforwarditerator.cpp
-QT = core
 
 include (../xmlpatterns.pri)
diff --git a/tests/auto/qapplication/test/test.pro b/tests/auto/qapplication/test/test.pro
index 27cc0ba..6452369 100644
--- a/tests/auto/qapplication/test/test.pro
+++ b/tests/auto/qapplication/test/test.pro
@@ -1,7 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
 
-SOURCES += ../tst_qapplication.cpp
 TARGET = ../tst_qapplication
+QT += testlib
+SOURCES += ../tst_qapplication.cpp
 
 wince* {
   additional.files = ../desktopsettingsaware/desktopsettingsaware.exe
diff --git a/tests/auto/qaudioinput/qaudioinput.pro b/tests/auto/qaudioinput/qaudioinput.pro
index d7ae7bc..db7e228 100644
--- a/tests/auto/qaudioinput/qaudioinput.pro
+++ b/tests/auto/qaudioinput/qaudioinput.pro
@@ -1,9 +1,9 @@
-load(qttest_p4)
+CONFIG += testcase
 
+TARGET = tst_qaudioinput
+QT = core multimedia testlib
 SOURCES += tst_qaudioinput.cpp
 
-QT = core multimedia
-
 wince* {
     deploy.files += 4.wav
     DEPLOYMENT += deploy
diff --git a/tests/auto/qcolordialog/qcolordialog.pro b/tests/auto/qcolordialog/qcolordialog.pro
index 830f9fa..2900bbc 100644
--- a/tests/auto/qcolordialog/qcolordialog.pro
+++ b/tests/auto/qcolordialog/qcolordialog.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-SOURCES  += tst_qcolordialog.cpp
-
-
+CONFIG += testcase
 
+TARGET = tst_qcolordialog
+QT += testlib
+SOURCES  += tst_qcolordialog.cpp
diff --git a/tests/auto/qcopchannel/test/test.pro b/tests/auto/qcopchannel/test/test.pro
index 8c7cc5b..db458f1 100644
--- a/tests/auto/qcopchannel/test/test.pro
+++ b/tests/auto/qcopchannel/test/test.pro
@@ -1,6 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
 
-SOURCES += ../tst_qcopchannel.cpp
 TARGET = ../tst_qcopchannel
-
-
+QT += testlib
+SOURCES += ../tst_qcopchannel.cpp
diff --git a/tests/auto/qcopchannel/testSend/testSend.pro b/tests/auto/qcopchannel/testSend/testSend.pro
index ebce3dd..8cd37bd 100644
--- a/tests/auto/qcopchannel/testSend/testSend.pro
+++ b/tests/auto/qcopchannel/testSend/testSend.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
-SOURCES = main.cpp
+CONFIG += testcase
+
 TARGET = testSend
+QT += testlib
+SOURCES = main.cpp
 
 requires(embedded)
-
diff --git a/tests/auto/qcryptographichash/qcryptographichash.pro b/tests/auto/qcryptographichash/qcryptographichash.pro
index 65e31dc..7ce190a 100644
--- a/tests/auto/qcryptographichash/qcryptographichash.pro
+++ b/tests/auto/qcryptographichash/qcryptographichash.pro
@@ -1,9 +1,12 @@
-load(qttest_p4)
+CONFIG += testcase
+
+TARGET = tst_qcryptographichash
+QT = core testlib
 SOURCES += tst_qcryptographichash.cpp
-QT = core
 
 symbian: {
-TARGET.EPOCSTACKSIZE =0x5000
-TARGET.EPOCHEAPSIZE="0x100000 0x1000000" # // Min 1Mb, max 16Mb
+    TARGET.EPOCSTACKSIZE =0x5000
+    TARGET.EPOCHEAPSIZE="0x100000 0x1000000" # // Min 1Mb, max 16Mb
 }
+
 CONFIG += parallel_test
diff --git a/tests/auto/qdbusservicewatcher/qdbusservicewatcher.pro b/tests/auto/qdbusservicewatcher/qdbusservicewatcher.pro
index 4970f16..0a325c9 100644
--- a/tests/auto/qdbusservicewatcher/qdbusservicewatcher.pro
+++ b/tests/auto/qdbusservicewatcher/qdbusservicewatcher.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT = core
+CONFIG += testcase
+TARGET = tst_qdbusservicewatcher
+QT = core dbus testlib
 contains(QT_CONFIG,dbus): {
         SOURCES += tst_qdbusservicewatcher.cpp
         QT += dbus
diff --git a/tests/auto/qdesktopservices/qdesktopservices.pro b/tests/auto/qdesktopservices/qdesktopservices.pro
index 43f6cba..4fe416c 100644
--- a/tests/auto/qdesktopservices/qdesktopservices.pro
+++ b/tests/auto/qdesktopservices/qdesktopservices.pro
@@ -1,7 +1,9 @@
-CONFIG += qttest_p4
+CONFIG += testcase
+
+TARGET = tst_qdesktopservices
+QT += testlib
+SOURCES += tst_qdesktopservices.cpp
 
-SOURCES		+= tst_qdesktopservices.cpp
-TARGET		= tst_qdesktopservices
 symbian: {
    dummy.files = text\\testfile.txt
    dummy.path = .
@@ -25,5 +27,4 @@ symbian: {
 
    # These are only needed for manual tests
    #DEPLOYMENT += dummy text
-   }
-
+}
diff --git a/tests/auto/qdirmodel/qdirmodel.pro b/tests/auto/qdirmodel/qdirmodel.pro
index 7037a79..5e6221a 100644
--- a/tests/auto/qdirmodel/qdirmodel.pro
+++ b/tests/auto/qdirmodel/qdirmodel.pro
@@ -1,5 +1,8 @@
-load(qttest_p4)
-SOURCES         += tst_qdirmodel.cpp
+CONFIG += testcase
+
+TARGET = tst_qdirmodel
+QT += testlib
+SOURCES += tst_qdirmodel.cpp
 
 wince*|symbian {
 	addit.files = dirtest\\test1\\*
diff --git a/tests/auto/qdrag/qdrag.pro b/tests/auto/qdrag/qdrag.pro
index ad36fa5..ca1741c 100644
--- a/tests/auto/qdrag/qdrag.pro
+++ b/tests/auto/qdrag/qdrag.pro
@@ -1,9 +1,6 @@
-############################################################
-# Project file for autotest for file qdrag.h
-############################################################
-
-load(qttest_p4)
+CONFIG += testcase
 
+TARGET = tst_qdrag
+QT += testlib
 SOURCES += tst_qdrag.cpp
 
-
diff --git a/tests/auto/qeventloop/qeventloop.pro b/tests/auto/qeventloop/qeventloop.pro
index 8e6a962..7505c27 100644
--- a/tests/auto/qeventloop/qeventloop.pro
+++ b/tests/auto/qeventloop/qeventloop.pro
@@ -1,7 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
+
+TARGET = tst_qeventloop
+QT = core network testlib
 SOURCES += tst_qeventloop.cpp
-QT -= gui 
-QT += network
 
 win32:!wince*:LIBS += -luser32
 
diff --git a/tests/auto/qfiledialog2/qfiledialog2.pro b/tests/auto/qfiledialog2/qfiledialog2.pro
index b8924c1..dae8aaf 100644
--- a/tests/auto/qfiledialog2/qfiledialog2.pro
+++ b/tests/auto/qfiledialog2/qfiledialog2.pro
@@ -1,9 +1,7 @@
-############################################################
-# Project file for autotest for file qfiledialog.h
-############################################################
-
-load(qttest_p4)
+CONFIG += testcase
 
+TARGET = tst_qfiledialog2
+QT += testlib
 SOURCES += tst_qfiledialog2.cpp
 
 wince*|symbian {
diff --git a/tests/auto/qfileopenevent/test/test.pro b/tests/auto/qfileopenevent/test/test.pro
index 3f16dcf..8efea04 100644
--- a/tests/auto/qfileopenevent/test/test.pro
+++ b/tests/auto/qfileopenevent/test/test.pro
@@ -1,7 +1,10 @@
-load(qttest_p4)
+CONFIG += testcase
+
 TARGET = tst_qfileopenevent
-HEADERS +=
+QT += testlib
 SOURCES += tst_qfileopenevent.cpp
+
+HEADERS +=
 symbian {
     LIBS+=-lefsrv -lapgrfx -lapmime
 }
diff --git a/tests/auto/qfilesystementry/qfilesystementry.pro b/tests/auto/qfilesystementry/qfilesystementry.pro
index b9b43e6..3604dea 100644
--- a/tests/auto/qfilesystementry/qfilesystementry.pro
+++ b/tests/auto/qfilesystementry/qfilesystementry.pro
@@ -1,8 +1,9 @@
-load(qttest_p4)
+CONFIG += testcase
 
+TARGET = tst_qfilesystementry
+QT = core testlib
 SOURCES   += tst_qfilesystementry.cpp \
     ../../../src/corelib/io/qfilesystementry.cpp
 HEADERS += ../../../src/corelib/io/qfilesystementry_p.h
-QT = core
 
 CONFIG += parallel_test
diff --git a/tests/auto/qfilesystemmodel/qfilesystemmodel.pro b/tests/auto/qfilesystemmodel/qfilesystemmodel.pro
index 65f25e0..716f72f 100644
--- a/tests/auto/qfilesystemmodel/qfilesystemmodel.pro
+++ b/tests/auto/qfilesystemmodel/qfilesystemmodel.pro
@@ -1,9 +1,8 @@
-CONFIG += qttest_p4
+CONFIG += testcase
 
-QT = core gui
-
-SOURCES		+= tst_qfilesystemmodel.cpp
-TARGET		= tst_qfilesystemmodel
+TARGET = tst_qfilesystemmodel
+QT += testlib
+SOURCES += tst_qfilesystemmodel.cpp
 
 symbian: {
     HEADERS += ../../../include/qtgui/private/qfileinfogatherer_p.h
diff --git a/tests/auto/qgl/qgl.pro b/tests/auto/qgl/qgl.pro
index ae8fe54..7c4b341 100644
--- a/tests/auto/qgl/qgl.pro
+++ b/tests/auto/qgl/qgl.pro
@@ -1,15 +1,13 @@
-############################################################
-# Project file for autotest for file qgl.h
-############################################################
+CONFIG += testcase
 
-load(qttest_p4)
-requires(contains(QT_CONFIG,opengl))
-QT += opengl
+TARGET = tst_qgl
+QT += opengl testlib
+SOURCES += tst_qgl.cpp
 
+requires(contains(QT_CONFIG,opengl))
 contains(QT_CONFIG,egl):DEFINES += QGL_EGL
 win32:!wince*: DEFINES += QT_NO_EGL
 
-SOURCES   += tst_qgl.cpp
 RESOURCES  = qgl.qrc
 
 CONFIG+=insignificant_test # QTQAINFRA-428
diff --git a/tests/auto/qgraphicseffect/qgraphicseffect.pro b/tests/auto/qgraphicseffect/qgraphicseffect.pro
index 59084b5..f35809c 100644
--- a/tests/auto/qgraphicseffect/qgraphicseffect.pro
+++ b/tests/auto/qgraphicseffect/qgraphicseffect.pro
@@ -1,4 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+
+TARGET = tst_qgraphicseffect
+QT += testlib
 SOURCES  += tst_qgraphicseffect.cpp
 CONFIG += parallel_test
 
diff --git a/tests/auto/qgraphicslinearlayout/qgraphicslinearlayout.pro b/tests/auto/qgraphicslinearlayout/qgraphicslinearlayout.pro
index df5a827..673f068 100644
--- a/tests/auto/qgraphicslinearlayout/qgraphicslinearlayout.pro
+++ b/tests/auto/qgraphicslinearlayout/qgraphicslinearlayout.pro
@@ -1,4 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
+
+TARGET = tst_qgraphicslinearlayout
+QT += testlib
 SOURCES  += tst_qgraphicslinearlayout.cpp
+
 CONFIG += parallel_test
 
diff --git a/tests/auto/qgraphicsobject/qgraphicsobject.pro b/tests/auto/qgraphicsobject/qgraphicsobject.pro
index 2418845..7cc92c1 100644
--- a/tests/auto/qgraphicsobject/qgraphicsobject.pro
+++ b/tests/auto/qgraphicsobject/qgraphicsobject.pro
@@ -1,3 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+
+TARGET = tst_qgraphicsobject
+QT += testlib
 SOURCES  += tst_qgraphicsobject.cpp
-CONFIG += parallel_test
\ No newline at end of file
+
+CONFIG += parallel_test
diff --git a/tests/auto/qgraphicspixmapitem/qgraphicspixmapitem.pro b/tests/auto/qgraphicspixmapitem/qgraphicspixmapitem.pro
index 6b4db95..de6e029 100644
--- a/tests/auto/qgraphicspixmapitem/qgraphicspixmapitem.pro
+++ b/tests/auto/qgraphicspixmapitem/qgraphicspixmapitem.pro
@@ -1,4 +1,6 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qgraphicspixmapitem
+QT += testlib
 SOURCES  += tst_qgraphicspixmapitem.cpp
 CONFIG += parallel_test
 
diff --git a/tests/auto/qgridlayout/qgridlayout.pro b/tests/auto/qgridlayout/qgridlayout.pro
index 00cc5ee..020d39d 100644
--- a/tests/auto/qgridlayout/qgridlayout.pro
+++ b/tests/auto/qgridlayout/qgridlayout.pro
@@ -1,6 +1,6 @@
-load(qttest_p4)
-SOURCES  += tst_qgridlayout.cpp
-FORMS           += sortdialog.ui
-
-
+CONFIG += testcase
 
+TARGET = tst_qgridlayout
+QT += testlib
+SOURCES += tst_qgridlayout.cpp
+FORMS   += sortdialog.ui
diff --git a/tests/auto/qgroupbox/qgroupbox.pro b/tests/auto/qgroupbox/qgroupbox.pro
index 5f5370f..c488c90 100644
--- a/tests/auto/qgroupbox/qgroupbox.pro
+++ b/tests/auto/qgroupbox/qgroupbox.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-SOURCES  += tst_qgroupbox.cpp
-
-
+CONFIG += testcase
 
+TARGET = tst_qgroupbox
+QT += testlib
+SOURCES  += tst_qgroupbox.cpp
diff --git a/tests/auto/qheaderview/qheaderview.pro b/tests/auto/qheaderview/qheaderview.pro
index 3436d4f..c24bf83 100644
--- a/tests/auto/qheaderview/qheaderview.pro
+++ b/tests/auto/qheaderview/qheaderview.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
-SOURCES  += tst_qheaderview.cpp
-
+CONFIG += testcase
 
+TARGET = tst_qheaderview
+QT += testlib
+SOURCES  += tst_qheaderview.cpp
diff --git a/tests/auto/qhostinfo/qhostinfo.pro b/tests/auto/qhostinfo/qhostinfo.pro
index c9e7464..e43cf4e 100644
--- a/tests/auto/qhostinfo/qhostinfo.pro
+++ b/tests/auto/qhostinfo/qhostinfo.pro
@@ -1,9 +1,9 @@
-load(qttest_p4)
+CONFIG += testcase
 
+TARGET = tst_qhostinfo
+QT = core network testlib
 SOURCES  += tst_qhostinfo.cpp
 
-QT = core network
-
 wince*: {
   LIBS += ws2.lib
 } else {
diff --git a/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro b/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
index 223c4e1..76a6cee 100644
--- a/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
+++ b/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
@@ -1,10 +1,12 @@
-load(qttest_p4)
+CONFIG += testcase
+
+TARGET = tst_qhttpnetworkconnection
+QT = core network testlib
 SOURCES  += tst_qhttpnetworkconnection.cpp
+
 INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/zlib
 requires(contains(QT_CONFIG,private_tests))
 
-QT = core network
-
 symbian: TARGET.CAPABILITY = NetworkServices
 symbian: {
   INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
diff --git a/tests/auto/qimage/qimage.pro b/tests/auto/qimage/qimage.pro
index 798c82e..475e635 100644
--- a/tests/auto/qimage/qimage.pro
+++ b/tests/auto/qimage/qimage.pro
@@ -1,4 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+
+TARGET = tst_qimage
+QT += testlib
 SOURCES  += tst_qimage.cpp
 
 wince*: {
diff --git a/tests/auto/qitemdelegate/qitemdelegate.pro b/tests/auto/qitemdelegate/qitemdelegate.pro
index 1206976..90fb32c 100644
--- a/tests/auto/qitemdelegate/qitemdelegate.pro
+++ b/tests/auto/qitemdelegate/qitemdelegate.pro
@@ -1,5 +1,8 @@
-load(qttest_p4)
-SOURCES         += tst_qitemdelegate.cpp
+CONFIG += testcase
+
+TARGET = tst_qitemdelegate
+QT += testlib
+SOURCES += tst_qitemdelegate.cpp
 
 win32:!wince*: LIBS += -lUser32
 
diff --git a/tests/auto/qlayout/qlayout.pro b/tests/auto/qlayout/qlayout.pro
index bb1ae4a..a541e9f 100644
--- a/tests/auto/qlayout/qlayout.pro
+++ b/tests/auto/qlayout/qlayout.pro
@@ -1,10 +1,9 @@
-############################################################
-# Project file for autotest for file qlayout.h
-############################################################
-
-load(qttest_p4)
+CONFIG += testcase
 
+TARGET = tst_qlayout
+QT += testlib
 SOURCES += tst_qlayout.cpp
+
 contains(QT_CONFIG, qt3support): QT += qt3support
 wince*|symbian: {
    addFiles.files = baseline
diff --git a/tests/auto/qlist/qlist.pro b/tests/auto/qlist/qlist.pro
index be599b7..470b3cc 100644
--- a/tests/auto/qlist/qlist.pro
+++ b/tests/auto/qlist/qlist.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-SOURCES  += tst_qlist.cpp
-
-
+CONFIG += testcase
 
+TARGET = tst_qlist
+QT = core testlib
+SOURCES += tst_qlist.cpp
diff --git a/tests/auto/qlistwidget/qlistwidget.pro b/tests/auto/qlistwidget/qlistwidget.pro
index 2bc1976..2b940d1 100644
--- a/tests/auto/qlistwidget/qlistwidget.pro
+++ b/tests/auto/qlistwidget/qlistwidget.pro
@@ -1,4 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+
+TARGET = tst_qlistwidget
+QT += testlib
 SOURCES  += tst_qlistwidget.cpp
 
 CONFIG+=insignificant_test # QTQAINFRA-428
diff --git a/tests/auto/qlocale/test/test.pro b/tests/auto/qlocale/test/test.pro
index 8117708..174eade 100644
--- a/tests/auto/qlocale/test/test.pro
+++ b/tests/auto/qlocale/test/test.pro
@@ -1,26 +1,22 @@
-load(qttest_p4)
-SOURCES += ../tst_qlocale.cpp
+CONFIG += testcase
 
-!wince*: {
 TARGET = ../tst_qlocale
+QT = core network testlib
+embedded: QT += gui
+SOURCES += ../tst_qlocale.cpp
 
-win32: {
-  CONFIG(debug, debug|release) {
-    TARGET = ../../debug/tst_qlocale
-} else {
-    TARGET = ../../release/tst_qlocale
+!wince*: {
+  win32: {
+    CONFIG(debug, debug|release) {
+      TARGET = ../../debug/tst_qlocale
+    } else {
+      TARGET = ../../release/tst_qlocale
+    }
   }
-}
 } else {
    TARGET = tst_qlocale
 }
 
-
-
-QT = core
-QT += network
-embedded: QT += gui
-
 wince*: {
    addFiles.files = \
         ../syslocaleapp
diff --git a/tests/auto/qmdiarea/qmdiarea.pro b/tests/auto/qmdiarea/qmdiarea.pro
index 7fa7575..90fe9f4 100644
--- a/tests/auto/qmdiarea/qmdiarea.pro
+++ b/tests/auto/qmdiarea/qmdiarea.pro
@@ -1,6 +1,10 @@
-load(qttest_p4)
-INCLUDEPATH += .
+CONFIG += testcase
+
+TARGET = tst_qmdiarea
+QT += testlib
 SOURCES += tst_qmdiarea.cpp
+
+INCLUDEPATH += .
 DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
 contains(QT_CONFIG, opengl):QT += opengl
 
diff --git a/tests/auto/qmovie/qmovie.pro b/tests/auto/qmovie/qmovie.pro
index 855eb9e..3a99c3c 100644
--- a/tests/auto/qmovie/qmovie.pro
+++ b/tests/auto/qmovie/qmovie.pro
@@ -1,5 +1,9 @@
-load(qttest_p4)
+CONFIG += testcase
+
+TARGET = tst_qmovie
+QT += testlib
 SOURCES += tst_qmovie.cpp
+
 MOC_DIR=tmp
 
 !contains(QT_CONFIG, no-gif):DEFINES += QTEST_HAVE_GIF
diff --git a/tests/auto/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro b/tests/auto/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro
index 378deba..d1badaa 100644
--- a/tests/auto/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro
+++ b/tests/auto/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qnetworkaccessmanager_and_qprogressdialog
 SOURCES += tst_qnetworkaccessmanager_and_qprogressdialog.cpp
-QT += network
+QT += network testlib
 
 symbian: TARGET.CAPABILITY = NetworkServices
 
diff --git a/tests/auto/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro b/tests/auto/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro
index 3ae5122..b8f6fd2 100644
--- a/tests/auto/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro
+++ b/tests/auto/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro
@@ -1,8 +1,9 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qnetworkconfigurationmanager
 SOURCES  += tst_qnetworkconfigurationmanager.cpp
 HEADERS  += ../qbearertestcommon.h
 
-QT = core network
+QT = core network testlib
 
 symbian {
     TARGET.CAPABILITY = NetworkServices NetworkControl ReadUserData
diff --git a/tests/auto/qnetworkinterface/qnetworkinterface.pro b/tests/auto/qnetworkinterface/qnetworkinterface.pro
index 1c5feee..85d4388 100644
--- a/tests/auto/qnetworkinterface/qnetworkinterface.pro
+++ b/tests/auto/qnetworkinterface/qnetworkinterface.pro
@@ -1,7 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qnetworkinterface
 SOURCES  += tst_qnetworkinterface.cpp
 
-QT = core network
+QT = core network testlib
 
 symbian: TARGET.CAPABILITY = NetworkServices
 
diff --git a/tests/auto/qnetworkreply/test/test.pro b/tests/auto/qnetworkreply/test/test.pro
index ce479d0..d52fcdb 100644
--- a/tests/auto/qnetworkreply/test/test.pro
+++ b/tests/auto/qnetworkreply/test/test.pro
@@ -1,19 +1,19 @@
-load(qttest_p4)
-QT -= gui
-SOURCES  += ../tst_qnetworkreply.cpp
+CONFIG += testcase
+
 TARGET = ../tst_qnetworkreply
+QT = core network testlib
+SOURCES  += ../tst_qnetworkreply.cpp
 
 win32 {
   CONFIG(debug, debug|release) {
     TARGET = ../../debug/tst_qnetworkreply
-} else {
+  } else {
     TARGET = ../../release/tst_qnetworkreply
   }
 }
 
 !symbian:DEFINES += SRCDIR=\\\"$$PWD/..\\\"
 
-QT = core network
 RESOURCES += ../qnetworkreply.qrc
 
 symbian|wince*:{
diff --git a/tests/auto/qnetworksession/test/test.pro b/tests/auto/qnetworksession/test/test.pro
index 645b061..15590e8 100644
--- a/tests/auto/qnetworksession/test/test.pro
+++ b/tests/auto/qnetworksession/test/test.pro
@@ -1,10 +1,10 @@
-load(qttest_p4)
+CONFIG += testcase
+
+TARGET = tst_qnetworksession
+QT = core network testlib
 SOURCES  += tst_qnetworksession.cpp
 HEADERS  += ../../qbearertestcommon.h
 
-QT = core network
-
-TARGET = tst_qnetworksession
 CONFIG(debug_and_release) {
   CONFIG(debug, debug|release) {
     DESTDIR = ../debug
diff --git a/tests/auto/qpainter/qpainter.pro b/tests/auto/qpainter/qpainter.pro
index 030b344..7762650 100644
--- a/tests/auto/qpainter/qpainter.pro
+++ b/tests/auto/qpainter/qpainter.pro
@@ -1,6 +1,11 @@
-load(qttest_p4)
-contains(QT_CONFIG, qt3support): QT += qt3support
+CONFIG += testcase
+
+TARGET = tst_qpainter
+QT += testlib
 SOURCES  += tst_qpainter.cpp
+
+contains(QT_CONFIG, qt3support): QT += qt3support
+
 wince*|symbian: {
     addFiles.files = drawEllipse drawLine_rop_bitmap drawPixmap_rop drawPixmap_rop_bitmap task217400.png
     addFiles.path = .
diff --git a/tests/auto/qpicture/qpicture.pro b/tests/auto/qpicture/qpicture.pro
index 9979fe3..54e9222 100644
--- a/tests/auto/qpicture/qpicture.pro
+++ b/tests/auto/qpicture/qpicture.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-SOURCES  += tst_qpicture.cpp
-
-
+CONFIG += testcase
 
+TARGET = tst_qpicture
+QT += testlib
+SOURCES += tst_qpicture.cpp
diff --git a/tests/auto/qplugin/tst_qplugin.pro b/tests/auto/qplugin/tst_qplugin.pro
index 3629fb3..779d432 100644
--- a/tests/auto/qplugin/tst_qplugin.pro
+++ b/tests/auto/qplugin/tst_qplugin.pro
@@ -1,12 +1,13 @@
-load(qttest_p4)
+CONFIG += testcase
 
+TARGET = tst_qplugin
+QT = core testlib
 SOURCES = tst_qplugin.cpp
-QT = core
 
 wince*: {
-   plugins.files = plugins/*
-   plugins.path = plugins
-   DEPLOYMENT += plugins
+    plugins.files = plugins/*
+    plugins.path = plugins
+    DEPLOYMENT += plugins
 }
 
 symbian: {
diff --git a/tests/auto/qprogressbar/qprogressbar.pro b/tests/auto/qprogressbar/qprogressbar.pro
index 6f0d772..985f159 100644
--- a/tests/auto/qprogressbar/qprogressbar.pro
+++ b/tests/auto/qprogressbar/qprogressbar.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-SOURCES += tst_qprogressbar.cpp
-
-
+CONFIG += testcase
 
+TARGET = tst_qprogressbar
+QT += testlib
+SOURCES += tst_qprogressbar.cpp
diff --git a/tests/auto/qpropertyanimation/qpropertyanimation.pro b/tests/auto/qpropertyanimation/qpropertyanimation.pro
index 6d6ddbf..de9d3e6 100644
--- a/tests/auto/qpropertyanimation/qpropertyanimation.pro
+++ b/tests/auto/qpropertyanimation/qpropertyanimation.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT = core gui
-SOURCES  += tst_qpropertyanimation.cpp
+CONFIG += testcase
 
+TARGET = tst_qpropertyanimation
+QT += testlib
+SOURCES  += tst_qpropertyanimation.cpp
 
diff --git a/tests/auto/qrawfont/qrawfont.pro b/tests/auto/qrawfont/qrawfont.pro
index ccdccfb..cfecfeb 100644
--- a/tests/auto/qrawfont/qrawfont.pro
+++ b/tests/auto/qrawfont/qrawfont.pro
@@ -1,8 +1,8 @@
-load(qttest_p4)
-QT = core gui
+CONFIG += testcase
 
-SOURCES += \
-    tst_qrawfont.cpp
+TARGET = tst_qrawfont
+QT = core gui testlib
+SOURCES += tst_qrawfont.cpp
 
 INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src
 
diff --git a/tests/auto/qringbuffer/qringbuffer.pro b/tests/auto/qringbuffer/qringbuffer.pro
index 2e4f166..7d822f6 100644
--- a/tests/auto/qringbuffer/qringbuffer.pro
+++ b/tests/auto/qringbuffer/qringbuffer.pro
@@ -1,7 +1,7 @@
-load(qttest_p4)
-SOURCES  += tst_qringbuffer.cpp
-
-QT = core
+CONFIG += testcase
 
+TARGET = tst_qringbuffer
+QT = core testlib
+SOURCES  += tst_qringbuffer.cpp
 
 CONFIG += parallel_test
diff --git a/tests/auto/qscriptcontextinfo/qscriptcontextinfo.pro b/tests/auto/qscriptcontextinfo/qscriptcontextinfo.pro
index 2483414..01fd007 100644
--- a/tests/auto/qscriptcontextinfo/qscriptcontextinfo.pro
+++ b/tests/auto/qscriptcontextinfo/qscriptcontextinfo.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-QT = core script
-SOURCES  += tst_qscriptcontextinfo.cpp
-
+CONFIG += testcase
 
+TARGET = tst_qscriptcontextinfo
+QT = core script testlib
+SOURCES  += tst_qscriptcontextinfo.cpp
diff --git a/tests/auto/qscriptengineagent/qscriptengineagent.pro b/tests/auto/qscriptengineagent/qscriptengineagent.pro
index 34c4280..045a166 100644
--- a/tests/auto/qscriptengineagent/qscriptengineagent.pro
+++ b/tests/auto/qscriptengineagent/qscriptengineagent.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-QT = core script
-SOURCES  += tst_qscriptengineagent.cpp
-
+CONFIG += testcase
 
+TARGET = tst_qscriptengineagent
+QT = core script testlib
+SOURCES  += tst_qscriptengineagent.cpp
diff --git a/tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro b/tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro
index 498fc1a..4f7cd3a 100644
--- a/tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro
+++ b/tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro
@@ -1,5 +1,7 @@
-load(qttest_p4)
-QT = core script
+CONFIG += testcase
+
+TARGET = tst_qscriptv8testsuite
+QT = core script testlib
 SOURCES  += tst_qscriptv8testsuite.cpp
 RESOURCES += qscriptv8testsuite.qrc
 include(abstracttestsuite.pri)
diff --git a/tests/auto/qscriptvaluegenerated/qscriptvaluegenerated.pro b/tests/auto/qscriptvaluegenerated/qscriptvaluegenerated.pro
index c3e9912..b2c3fa7 100644
--- a/tests/auto/qscriptvaluegenerated/qscriptvaluegenerated.pro
+++ b/tests/auto/qscriptvaluegenerated/qscriptvaluegenerated.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT = core gui script
+TARGET = tst_qscriptvaluegenerated
+CONFIG += testcase
+QT = core gui script testlib
 SOURCES  += tst_qscriptvalue.cpp
 HEADERS  += tst_qscriptvalue.h
 
diff --git a/tests/auto/qscriptvalueiterator/qscriptvalueiterator.pro b/tests/auto/qscriptvalueiterator/qscriptvalueiterator.pro
index 884efa0..0710ca0 100644
--- a/tests/auto/qscriptvalueiterator/qscriptvalueiterator.pro
+++ b/tests/auto/qscriptvalueiterator/qscriptvalueiterator.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-QT = core script
-SOURCES  += tst_qscriptvalueiterator.cpp
-
+CONFIG += testcase
 
+TARGET = tst_qscriptvalueiterator
+QT = core script testlib
+SOURCES  += tst_qscriptvalueiterator.cpp
diff --git a/tests/auto/qscrollarea/qscrollarea.pro b/tests/auto/qscrollarea/qscrollarea.pro
index bcb2ff3..a19f9ae 100644
--- a/tests/auto/qscrollarea/qscrollarea.pro
+++ b/tests/auto/qscrollarea/qscrollarea.pro
@@ -1,9 +1,5 @@
-############################################################
-# Project file for autotest for file qscrollarea.h
-############################################################
-
-load(qttest_p4)
+CONFIG += testcase
 
+TARGET = tst_qscrollarea
+QT += testlib
 SOURCES += tst_qscrollarea.cpp
-
-
diff --git a/tests/auto/qslider/qslider.pro b/tests/auto/qslider/qslider.pro
index 32fcc81..77f9163 100644
--- a/tests/auto/qslider/qslider.pro
+++ b/tests/auto/qslider/qslider.pro
@@ -1,9 +1,5 @@
-############################################################
-# Project file for autotest for file qslider.h
-############################################################
-
-load(qttest_p4)
+CONFIG += testcase
 
+TARGET = tst_qslider
+QT += testlib
 SOURCES += tst_qslider.cpp
-
-
diff --git a/tests/auto/qsourcelocation/qsourcelocation.pro b/tests/auto/qsourcelocation/qsourcelocation.pro
index 3cfcb46..ff39bd3 100644
--- a/tests/auto/qsourcelocation/qsourcelocation.pro
+++ b/tests/auto/qsourcelocation/qsourcelocation.pro
@@ -1,4 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+
+TARGET = tst_qsourcelocation
+QT += testlib
 SOURCES += tst_qsourcelocation.cpp
 
 include (../xmlpatterns.pri)
diff --git a/tests/auto/qspinbox/qspinbox.pro b/tests/auto/qspinbox/qspinbox.pro
index a65554a..487224b 100644
--- a/tests/auto/qspinbox/qspinbox.pro
+++ b/tests/auto/qspinbox/qspinbox.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-SOURCES  += tst_qspinbox.cpp
-
-
+CONFIG += testcase
 
+TARGET = tst_qspinbox
+QT += testlib
+SOURCES  += tst_qspinbox.cpp
diff --git a/tests/auto/qsql/qsql.pro b/tests/auto/qsql/qsql.pro
index 9bf30f8..2b49251 100644
--- a/tests/auto/qsql/qsql.pro
+++ b/tests/auto/qsql/qsql.pro
@@ -1,7 +1,8 @@
-load(qttest_p4)
-SOURCES  += tst_qsql.cpp
+CONFIG += testcase
 
-QT += sql
+TARGET = tst_qsql
+QT += sql testlib
+SOURCES  += tst_qsql.cpp
 
 contains(QT_CONFIG, qt3support): QT += qt3support
 
diff --git a/tests/auto/qsqldatabase/qsqldatabase.pro b/tests/auto/qsqldatabase/qsqldatabase.pro
index 066c24f..6561c54 100644
--- a/tests/auto/qsqldatabase/qsqldatabase.pro
+++ b/tests/auto/qsqldatabase/qsqldatabase.pro
@@ -1,7 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qsqldatabase
 SOURCES  += tst_qsqldatabase.cpp
 
-QT += sql
+QT += sql testlib
 
 contains(QT_CONFIG, qt3support): QT += qt3support
 
diff --git a/tests/auto/qsqlerror/qsqlerror.pro b/tests/auto/qsqlerror/qsqlerror.pro
index ebf6d24..7690324 100644
--- a/tests/auto/qsqlerror/qsqlerror.pro
+++ b/tests/auto/qsqlerror/qsqlerror.pro
@@ -1,10 +1,7 @@
-############################################################
-# Project file for autotest for file qsqlerror.h
-############################################################
-
-load(qttest_p4)
-QT = core sql
+CONFIG += testcase
 
+TARGET = tst_qsqlerror
+QT = core sql testlib
 SOURCES += tst_qsqlerror.cpp
 
 symbian {
diff --git a/tests/auto/qsqlquerymodel/qsqlquerymodel.pro b/tests/auto/qsqlquerymodel/qsqlquerymodel.pro
index 4b23e94..ec785f5 100644
--- a/tests/auto/qsqlquerymodel/qsqlquerymodel.pro
+++ b/tests/auto/qsqlquerymodel/qsqlquerymodel.pro
@@ -1,7 +1,8 @@
-load(qttest_p4)
-SOURCES  += tst_qsqlquerymodel.cpp
+CONFIG += testcase
 
-QT += sql
+TARGET = tst_qsqlquerymodel
+QT += sql testlib
+SOURCES  += tst_qsqlquerymodel.cpp
 
 wince*: {
    DEPLOYMENT_PLUGIN += qsqlite
diff --git a/tests/auto/qsqltablemodel/qsqltablemodel.pro b/tests/auto/qsqltablemodel/qsqltablemodel.pro
index e49020f..e7e0d65 100644
--- a/tests/auto/qsqltablemodel/qsqltablemodel.pro
+++ b/tests/auto/qsqltablemodel/qsqltablemodel.pro
@@ -1,14 +1,15 @@
-load(qttest_p4)
-SOURCES  += tst_qsqltablemodel.cpp
+CONFIG += testcase
 
-QT += sql
+TARGET = tst_qsqltablemodel
+QT = core sql testlib
+SOURCES  += tst_qsqltablemodel.cpp
 
 wince*: {
    plugFiles.files = ../../../plugins/sqldrivers
    plugFiles.path    = .
    DEPLOYMENT += plugFiles
    LIBS += -lws2
-}else:symbian {
+} else:symbian {
     qt_not_deployed {
         contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
             sqlite.path = /sys/bin
@@ -16,7 +17,6 @@ wince*: {
             DEPLOYMENT += sqlite
         }
     }
-}else {
+} else {
    win32:LIBS += -lws2_32
 }
-
diff --git a/tests/auto/qsslcertificate/qsslcertificate.pro b/tests/auto/qsslcertificate/qsslcertificate.pro
index 05cce8e..827aa49 100644
--- a/tests/auto/qsslcertificate/qsslcertificate.pro
+++ b/tests/auto/qsslcertificate/qsslcertificate.pro
@@ -1,10 +1,9 @@
-load(qttest_p4)
+CONFIG += testcase
 
+TARGET = tst_qsslcertificate
+QT = core network testlib
 SOURCES += tst_qsslcertificate.cpp
 !wince*:win32:LIBS += -lws2_32
-QT = core network
-
-TARGET = tst_qsslcertificate
 
 win32 {
   CONFIG(debug, debug|release) {
diff --git a/tests/auto/qstyleoption/qstyleoption.pro b/tests/auto/qstyleoption/qstyleoption.pro
index 523d9b3..330b1f7 100644
--- a/tests/auto/qstyleoption/qstyleoption.pro
+++ b/tests/auto/qstyleoption/qstyleoption.pro
@@ -1,11 +1,6 @@
-######################################################################
-# Automatically generated by qmake (2.00a) ti 8. mar 16:20:21 2005
-######################################################################
+CONFIG += testcase
 
-load(qttest_p4)
+TARGET = tst_qstyleoption
 TEMPLATE = app
-
-# Input
+QT += testlib
 SOURCES += tst_qstyleoption.cpp
-
-
diff --git a/tests/auto/qsvgdevice/qsvgdevice.pro b/tests/auto/qsvgdevice/qsvgdevice.pro
index 7eed6c8..388379a 100644
--- a/tests/auto/qsvgdevice/qsvgdevice.pro
+++ b/tests/auto/qsvgdevice/qsvgdevice.pro
@@ -1,6 +1,5 @@
-load(qttest_p4)
-SOURCES  += tst_qsvgdevice.cpp
-QT += xml
-
-
+CONFIG += testcase
 
+TARGET = tst_qsvgdevice
+QT += xml testlib
+SOURCES  += tst_qsvgdevice.cpp
diff --git a/tests/auto/qtableview/qtableview.pro b/tests/auto/qtableview/qtableview.pro
index dcda6ae..cdec41f 100644
--- a/tests/auto/qtableview/qtableview.pro
+++ b/tests/auto/qtableview/qtableview.pro
@@ -1,5 +1,7 @@
-load(qttest_p4)
-TARGET.EPOCHEAPSIZE = 0x200000 0x800000
+CONFIG += testcase
+
+TARGET = tst_qtableview
+QT += testlib
 SOURCES  += tst_qtableview.cpp
 
 CONFIG+=insignificant_test # QTQAINFRA-428
diff --git a/tests/auto/qtabwidget/qtabwidget.pro b/tests/auto/qtabwidget/qtabwidget.pro
index 0c2fc66..1a2ffe0 100644
--- a/tests/auto/qtabwidget/qtabwidget.pro
+++ b/tests/auto/qtabwidget/qtabwidget.pro
@@ -1,11 +1,12 @@
-load(qttest_p4)
+CONFIG += testcase
+
+TARGET = tst_qtabwidget
+QT += testlib
+SOURCES += tst_qtabwidget.cpp
 
 INCLUDEPATH += ../
 
 HEADERS +=  
-SOURCES += tst_qtabwidget.cpp
 contains(QT_CONFIG, qt3support): QT += qt3support
 
 win32:!wince*:LIBS += -luser32
-
-
diff --git a/tests/auto/qtconcurrentrun/qtconcurrentrun.pro b/tests/auto/qtconcurrentrun/qtconcurrentrun.pro
index 2457604..159b00a 100644
--- a/tests/auto/qtconcurrentrun/qtconcurrentrun.pro
+++ b/tests/auto/qtconcurrentrun/qtconcurrentrun.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
+CONFIG += testcase
+
+TARGET = tst_qtconcurrentrun
+QT = core testlib
 SOURCES += tst_qtconcurrentrun.cpp
-QT = core
-CONFIG += parallel_test
 CONFIG += parallel_test
diff --git a/tests/auto/qtconcurrentthreadengine/qtconcurrentthreadengine.pro b/tests/auto/qtconcurrentthreadengine/qtconcurrentthreadengine.pro
index bbfcf5e..f823ac3 100644
--- a/tests/auto/qtconcurrentthreadengine/qtconcurrentthreadengine.pro
+++ b/tests/auto/qtconcurrentthreadengine/qtconcurrentthreadengine.pro
@@ -1,5 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+
+TARGET = tst_qtconcurrentthreadengine
+QT = core testlib
 SOURCES += tst_qtconcurrentthreadengine.cpp
-QT = core
-CONFIG += parallel_test
+
 CONFIG += parallel_test
diff --git a/tests/auto/qtextdocumentlayout/qtextdocumentlayout.pro b/tests/auto/qtextdocumentlayout/qtextdocumentlayout.pro
index b2dc6a1..f43f735 100644
--- a/tests/auto/qtextdocumentlayout/qtextdocumentlayout.pro
+++ b/tests/auto/qtextdocumentlayout/qtextdocumentlayout.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
-SOURCES += tst_qtextdocumentlayout.cpp
-
+CONFIG += testcase
 
+TARGET = tst_qtextdocumentlayout
+QT += testlib
+SOURCES += tst_qtextdocumentlayout.cpp
diff --git a/tests/auto/qtextodfwriter/qtextodfwriter.pro b/tests/auto/qtextodfwriter/qtextodfwriter.pro
index f5e2c09..ea1cebc 100644
--- a/tests/auto/qtextodfwriter/qtextodfwriter.pro
+++ b/tests/auto/qtextodfwriter/qtextodfwriter.pro
@@ -1,4 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+
+TARGET = tst_qtextodfwriter
+QT += testlib
 SOURCES += tst_qtextodfwriter.cpp
 
 !symbian:DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/qtextscriptengine/qtextscriptengine.pro b/tests/auto/qtextscriptengine/qtextscriptengine.pro
index f30edc0..3e4a2da 100644
--- a/tests/auto/qtextscriptengine/qtextscriptengine.pro
+++ b/tests/auto/qtextscriptengine/qtextscriptengine.pro
@@ -1,6 +1,9 @@
-load(qttest_p4)
+CONFIG += testcase
+
+TARGET = tst_qtextscriptengine
+QT += testlib
+SOURCES += tst_qtextscriptengine.cpp
 HEADERS += 
-SOURCES += tst_qtextscriptengine.cpp 
 INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src
 
 CONFIG+=insignificant_test # QTQAINFRA-428
diff --git a/tests/auto/qtextstream/test/test.pro b/tests/auto/qtextstream/test/test.pro
index 8805fb9..54378c8 100644
--- a/tests/auto/qtextstream/test/test.pro
+++ b/tests/auto/qtextstream/test/test.pro
@@ -1,12 +1,13 @@
-load(qttest_p4)
-SOURCES  += ../tst_qtextstream.cpp
+CONFIG += testcase
 
 TARGET = ../tst_qtextstream
+QT = core network testlib
+SOURCES  += ../tst_qtextstream.cpp
 
 win32 {
   CONFIG(debug, debug|release) {
     TARGET = ../../debug/tst_qtextstream
-} else {
+  } else {
     TARGET = ../../release/tst_qtextstream
   }
 }
@@ -14,8 +15,6 @@ win32 {
 RESOURCES += ../qtextstream.qrc
 
 contains(QT_CONFIG, qt3support):QT += qt3support
-QT = core network
-
 
 wince*|symbian: {
    addFiles.files = ../rfc3261.txt ../shift-jis.txt ../task113817.txt ../qtextstream.qrc ../tst_qtextstream.cpp
diff --git a/tests/auto/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro b/tests/auto/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro
index e232443..88e4312 100644
--- a/tests/auto/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro
+++ b/tests/auto/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro
@@ -1,5 +1,8 @@
-CONFIG += qttest_p4
-#QT = core
+CONFIG += testcase
+
+TARGET = tst_qsystemlock
+QT += testlib
+SOURCES += tst_qsystemlock.cpp
 
 include(../src/src.pri)
 win32: CONFIG += console
@@ -15,8 +18,3 @@ DESTDIR = ./
 
 DEFINES	+= QSHAREDMEMORY_DEBUG
 DEFINES	+= QSYSTEMSEMAPHORE_DEBUG
-
-SOURCES		+= tst_qsystemlock.cpp 
-TARGET		= tst_qsystemlock
-
-
diff --git a/tests/auto/qtipc/qsharedmemory/test/test.pro b/tests/auto/qtipc/qsharedmemory/test/test.pro
index 50c2669..4dea9ce 100644
--- a/tests/auto/qtipc/qsharedmemory/test/test.pro
+++ b/tests/auto/qtipc/qsharedmemory/test/test.pro
@@ -1,18 +1,18 @@
-load(qttest_p4)
+CONFIG += testcase
+
+TARGET = ../tst_qsharedmemory
+QT = core testlib
+SOURCES += ../tst_qsharedmemory.cpp
 
 include(../src/src.pri)
-QT -= gui
 
 DEFINES	+= QSHAREDMEMORY_DEBUG
 DEFINES	+= QSYSTEMSEMAPHORE_DEBUG
 
-SOURCES += ../tst_qsharedmemory.cpp
-TARGET = ../tst_qsharedmemory
-
 !wince*:win32 {
   CONFIG(debug, debug|release) {
     TARGET = ../../debug/tst_qsharedmemory
-} else {
+  } else {
     TARGET = ../../release/tst_qsharedmemory
   }
 }
diff --git a/tests/auto/qtipc/qsystemsemaphore/qsystemsemaphore.pro b/tests/auto/qtipc/qsystemsemaphore/qsystemsemaphore.pro
index e05b6b8..f6bc369 100644
--- a/tests/auto/qtipc/qsystemsemaphore/qsystemsemaphore.pro
+++ b/tests/auto/qtipc/qsystemsemaphore/qsystemsemaphore.pro
@@ -1,5 +1,8 @@
-load(qttest_p4)
-#QT = core
+CONFIG += testcase
+
+TARGET = tst_qsystemsemaphore
+QT += testlib
+SOURCES += tst_qsystemsemaphore.cpp
 
 include(../qsharedmemory/src/src.pri)
 win32: CONFIG += console
@@ -7,9 +10,6 @@ win32: CONFIG += console
 DEFINES	+= QSHAREDMEMORY_DEBUG
 DEFINES	+= QSYSTEMSEMAPHORE_DEBUG
 
-SOURCES		+= tst_qsystemsemaphore.cpp 
-TARGET		= tst_qsystemsemaphore
-
 RESOURCES += files.qrc
 
 wince*: {
diff --git a/tests/auto/qvideosurfaceformat/qvideosurfaceformat.pro b/tests/auto/qvideosurfaceformat/qvideosurfaceformat.pro
index 830b3d7..26b70d1d 100644
--- a/tests/auto/qvideosurfaceformat/qvideosurfaceformat.pro
+++ b/tests/auto/qvideosurfaceformat/qvideosurfaceformat.pro
@@ -1,5 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+
+TARGET = tst_qvideosurfaceformat
+QT += multimedia testlib
 SOURCES += tst_qvideosurfaceformat.cpp
 
-QT += multimedia
 requires(contains(QT_CONFIG, multimedia))
diff --git a/tests/auto/qwindowsurface/qwindowsurface.pro b/tests/auto/qwindowsurface/qwindowsurface.pro
index 83b2a6d..0f5b297 100644
--- a/tests/auto/qwindowsurface/qwindowsurface.pro
+++ b/tests/auto/qwindowsurface/qwindowsurface.pro
@@ -1,7 +1,5 @@
 CONFIG += testcase
-TARGET = tst_qwindowsurface
-
-QT += widgets widgets-private testlib
-QT += gui-private
 
+TARGET = tst_qwindowsurface
+QT += testlib
 SOURCES += tst_qwindowsurface.cpp
diff --git a/tests/auto/qwineventnotifier/qwineventnotifier.pro b/tests/auto/qwineventnotifier/qwineventnotifier.pro
index 62da3a3..7896c30 100644
--- a/tests/auto/qwineventnotifier/qwineventnotifier.pro
+++ b/tests/auto/qwineventnotifier/qwineventnotifier.pro
@@ -1,4 +1,6 @@
-load(qttest_p4)
-SOURCES  += tst_qwineventnotifier.cpp
-QT = core
+CONFIG += testcase
+
+TARGET = tst_qwineventnotifier
+QT = core testlib
+SOURCES += tst_qwineventnotifier.cpp
 CONFIG += parallel_test
diff --git a/tests/auto/qwsembedwidget/qwsembedwidget.pro b/tests/auto/qwsembedwidget/qwsembedwidget.pro
index 97cbf94..ff2b6e8 100644
--- a/tests/auto/qwsembedwidget/qwsembedwidget.pro
+++ b/tests/auto/qwsembedwidget/qwsembedwidget.pro
@@ -1,4 +1,5 @@
 CONFIG += testcase
+
 TARGET = tst_qwsembedwidget
-QT += widgets testlib
+QT += testlib
 SOURCES += tst_qwsembedwidget.cpp
diff --git a/tests/auto/qx11info/qx11info.pro b/tests/auto/qx11info/qx11info.pro
index 3782644..5533660 100644
--- a/tests/auto/qx11info/qx11info.pro
+++ b/tests/auto/qx11info/qx11info.pro
@@ -1,4 +1,5 @@
 CONFIG += testcase
+
 TARGET = tst_qx11info
-QT += widgets testlib
+QT += testlib
 SOURCES += tst_qx11info.cpp
diff --git a/tests/auto/qxmlitem/qxmlitem.pro b/tests/auto/qxmlitem/qxmlitem.pro
index 54c8969..0afd674 100644
--- a/tests/auto/qxmlitem/qxmlitem.pro
+++ b/tests/auto/qxmlitem/qxmlitem.pro
@@ -1,4 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+
+TARGET = tst_qxmlitem
+QT += testlib
 SOURCES += tst_qxmlitem.cpp
 
 include (../xmlpatterns.pri)
diff --git a/tests/auto/qxmlname/qxmlname.pro b/tests/auto/qxmlname/qxmlname.pro
index dd317a7..d5e3f69 100644
--- a/tests/auto/qxmlname/qxmlname.pro
+++ b/tests/auto/qxmlname/qxmlname.pro
@@ -1,4 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+
+TARGET = tst_qxmlname
+QT += testlib
 SOURCES += tst_qxmlname.cpp
 
 include (../xmlpatterns.pri)
diff --git a/tests/auto/qxmlnodemodelindex/qxmlnodemodelindex.pro b/tests/auto/qxmlnodemodelindex/qxmlnodemodelindex.pro
index 73a5b00..cddda29 100644
--- a/tests/auto/qxmlnodemodelindex/qxmlnodemodelindex.pro
+++ b/tests/auto/qxmlnodemodelindex/qxmlnodemodelindex.pro
@@ -1,4 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+
+TARGET = tst_qxmlnodemodelindex
+QT += testlib
 SOURCES += tst_qxmlnodemodelindex.cpp
 
 include (../xmlpatterns.pri)
diff --git a/tests/auto/qxmlresultitems/qxmlresultitems.pro b/tests/auto/qxmlresultitems/qxmlresultitems.pro
index 7d74c20..6004e8e 100644
--- a/tests/auto/qxmlresultitems/qxmlresultitems.pro
+++ b/tests/auto/qxmlresultitems/qxmlresultitems.pro
@@ -1,4 +1,6 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qxmlresultitems
+QT += testlib
 SOURCES += tst_qxmlresultitems.cpp
 
 include (../xmlpatterns.pri)
diff --git a/tests/auto/qxmlschema/qxmlschema.pro b/tests/auto/qxmlschema/qxmlschema.pro
index f5abe4f..93238bc 100644
--- a/tests/auto/qxmlschema/qxmlschema.pro
+++ b/tests/auto/qxmlschema/qxmlschema.pro
@@ -1,5 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+
+TARGET = tst_qxmlschema
+QT += network testlib
 SOURCES += tst_qxmlschema.cpp
-QT += network
 
 include (../xmlpatterns.pri)
diff --git a/tests/auto/qzip/qzip.pro b/tests/auto/qzip/qzip.pro
index 683da62..e8f26a4 100644
--- a/tests/auto/qzip/qzip.pro
+++ b/tests/auto/qzip/qzip.pro
@@ -1,4 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+
+TARGET = tst_qzip
+QT += testlib
 SOURCES += tst_qzip.cpp
 
 wince*|symbian: {
diff --git a/tests/auto/symbols/symbols.pro b/tests/auto/symbols/symbols.pro
index f3bde3d..fd4c1d0 100644
--- a/tests/auto/symbols/symbols.pro
+++ b/tests/auto/symbols/symbols.pro
@@ -1,7 +1,9 @@
-load(qttest_p4)
+CONFIG += testcase
 
-cross_compile: DEFINES += QT_CROSS_COMPILED
+TARGET = tst_symbols
+QT = core testlib
 SOURCES += tst_symbols.cpp
-QT = core
+
+cross_compile: DEFINES += QT_CROSS_COMPILED
 
 CONFIG+=insignificant_test # QTQAINFRA-428
diff --git a/tests/auto/uic/uic.pro b/tests/auto/uic/uic.pro
index 355cb56..1dfeae6 100644
--- a/tests/auto/uic/uic.pro
+++ b/tests/auto/uic/uic.pro
@@ -1,8 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
 
-CONFIG += qtestlib
-SOURCES += tst_uic.cpp
 TARGET = tst_uic
+QT += testlib
+SOURCES += tst_uic.cpp
 
 # This test is not run on wince (I think)
 DEFINES += SRCDIR=\\\"$$PWD/\\\"
diff --git a/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro b/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro
index 0ced633..3187999 100644
--- a/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro
+++ b/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro
@@ -1,4 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+
+TARGET = tst_xmlpatternsxqts
+QT += xml testlib
 SOURCES += tst_xmlpatternsxqts.cpp ../qxmlquery/TestFundament.cpp tst_suitetest.cpp
 
 include(../xmlpatterns.pri)
@@ -16,8 +19,4 @@ INCLUDEPATH += $$(QTDIR)/include/QtXmlPatterns/private      \
                $$(QTDIR)/tools/xmlpatterns                  \
                ../xmlpatternssdk/
 
-CONFIG += testlib
-QT += xml
-TARGET = tst_xmlpatternsxqts
-
 requires(contains(QT_CONFIG,private_tests))