tests: eliminated usage of qttest_p4.prf [part 3]

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: I65ba34a59db7aa15bc6304e690c825a4d6cd1037
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
(cherry picked from commit 6974cc0a9ea2911a9ffd097f05955c1ca73e184a)
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>

33 files changed, 143 insertions, 120 deletions

diff --git a/tests/auto/checkxmlfiles/checkxmlfiles.pro b/tests/auto/checkxmlfiles/checkxmlfiles.pro
index ab932f51d2..5bbfd6cb14 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 9ef634e27f..7912f8304a 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/moc/moc.pro b/tests/auto/moc/moc.pro
index 4fb9ac4f5a..f360a0b3de 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/qabstractproxymodel/qabstractproxymodel.pro b/tests/auto/qabstractproxymodel/qabstractproxymodel.pro
index d1bff92543..f5dd43c23c 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 080719a720..84372742c2 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/qcopchannel/test/test.pro b/tests/auto/qcopchannel/test/test.pro
index 8c7cc5baaa..db458f1c4d 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 ebce3ddb4e..8cd37bdff7 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 65e31dcb57..7ce190a94d 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/qdesktopservices/qdesktopservices.pro b/tests/auto/qdesktopservices/qdesktopservices.pro
index 43f6cba267..4fe416c293 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/qfiledialog2/qfiledialog2.pro b/tests/auto/qfiledialog2/qfiledialog2.pro
index b8924c161b..dae8aaf4b6 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/qfilesystementry/qfilesystementry.pro b/tests/auto/qfilesystementry/qfilesystementry.pro
index b9b43e6a9f..3604deaef6 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/qgraphicsobject/qgraphicsobject.pro b/tests/auto/qgraphicsobject/qgraphicsobject.pro
index 2418845b73..7cc92c1629 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/qgroupbox/qgroupbox.pro b/tests/auto/qgroupbox/qgroupbox.pro
index 5f5370f0cb..c488c907aa 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 3436d4fc20..c24bf8315a 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 c9e74642cd..e43cf4eaec 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/qlist/qlist.pro b/tests/auto/qlist/qlist.pro
index be599b7b85..470b3cc25b 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/qnetworkreply/test/test.pro b/tests/auto/qnetworkreply/test/test.pro
index ce479d0b76..d52fcdb48e 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 645b061bc1..15590e83bc 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 030b344152..7762650347 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 9979fe3559..54e9222f90 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 3629fb36a1..779d4326eb 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 6f0d7728fe..985f15960d 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/qrawfont/qrawfont.pro b/tests/auto/qrawfont/qrawfont.pro
index ccdccfb0eb..cfecfeb6aa 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/qspinbox/qspinbox.pro b/tests/auto/qspinbox/qspinbox.pro
index a65554a087..487224b200 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/qsqlerror/qsqlerror.pro b/tests/auto/qsqlerror/qsqlerror.pro
index ebf6d24381..76903249d3 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/qsqltablemodel/qsqltablemodel.pro b/tests/auto/qsqltablemodel/qsqltablemodel.pro
index e49020f0a6..e7e0d65d3b 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/qstyleoption/qstyleoption.pro b/tests/auto/qstyleoption/qstyleoption.pro
index 523d9b3946..330b1f7bcc 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 7eed6c8545..388379a311 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/qtabwidget/qtabwidget.pro b/tests/auto/qtabwidget/qtabwidget.pro
index 0c2fc66981..1a2ffe03ff 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/qtextodfwriter/qtextodfwriter.pro b/tests/auto/qtextodfwriter/qtextodfwriter.pro
index f5e2c09fa0..ea1cebc369 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/qxmlname/qxmlname.pro b/tests/auto/qxmlname/qxmlname.pro
index dd317a7ef2..d5e3f69b40 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/symbols/symbols.pro b/tests/auto/symbols/symbols.pro
index f3bde3d346..fd4c1d0bd6 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 10444f6439..1dfeae6ac7 100644
--- a/tests/auto/uic/uic.pro
+++ b/tests/auto/uic/uic.pro
@@ -1,7 +1,7 @@
 CONFIG += testcase
 
 TARGET = tst_uic
-QT += qtestlib
+QT += testlib
 SOURCES += tst_uic.cpp
 
 # This test is not run on wince (I think)