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: I7e6c67674ec669ad1ba7286648c7b4a501f4201c
Reviewed-on: http://codereview.qt-project.org/6185
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>

32 files changed, 94 insertions, 52 deletions

diff --git a/tests/auto/checkxmlfiles/checkxmlfiles.pro b/tests/auto/checkxmlfiles/checkxmlfiles.pro
index 55e27a7..3f0122b 100644
--- a/tests/auto/checkxmlfiles/checkxmlfiles.pro
+++ b/tests/auto/checkxmlfiles/checkxmlfiles.pro
@@ -1,8 +1,8 @@
-load(qttest_p4)
+TARGET = tst_checkxmlfiles
+CONFIG += testcase
 SOURCES += tst_checkxmlfiles.cpp \
            ../qxmlquery/TestFundament.cpp
-CONFIG += qtestlib
-QT -= gui
+QT = core gui testlib
 
 include (../xmlpatterns.pri)
 
diff --git a/tests/auto/headersclean/headersclean.pro b/tests/auto/headersclean/headersclean.pro
index 737edce..93b0e58 100644
--- a/tests/auto/headersclean/headersclean.pro
+++ b/tests/auto/headersclean/headersclean.pro
@@ -1,3 +1,4 @@
-load(qttest_p4)
+TARGET = tst_headersclean
+CONFIG += testcase
 SOURCES  += tst_headersclean.cpp
-QT = core xmlpatterns
+QT = core xmlpatterns testlib
diff --git a/tests/auto/patternistexamplefiletree/patternistexamplefiletree.pro b/tests/auto/patternistexamplefiletree/patternistexamplefiletree.pro
index 772c833..61ba4c3 100644
--- a/tests/auto/patternistexamplefiletree/patternistexamplefiletree.pro
+++ b/tests/auto/patternistexamplefiletree/patternistexamplefiletree.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
+TARGET = tst_patternistexamplefiletree
+CONFIG += testcase
 SOURCES += tst_patternistexamplefiletree.cpp
-QT = core
+QT = core testlib
 
 include (../xmlpatterns.pri)
diff --git a/tests/auto/patternistexamples/patternistexamples.pro b/tests/auto/patternistexamples/patternistexamples.pro
index 098b0fe..0790854 100644
--- a/tests/auto/patternistexamples/patternistexamples.pro
+++ b/tests/auto/patternistexamples/patternistexamples.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+TARGET = tst_patternistexamples
+CONFIG += testcase
 SOURCES += tst_patternistexamples.cpp
-CONFIG += qtestlib
+QT += testlib
 wince*|symbian: {
 	snippets.files = $$QT_SOURCE_TREE/doc/src/snippets/patternist/*
 	snippets.path = patternist
diff --git a/tests/auto/patternistheaders/patternistheaders.pro b/tests/auto/patternistheaders/patternistheaders.pro
index fe4d670..a1f4596 100644
--- a/tests/auto/patternistheaders/patternistheaders.pro
+++ b/tests/auto/patternistheaders/patternistheaders.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
+TARGET = tst_patternistheaders
+CONFIG += testcase
 SOURCES += tst_patternistheaders.cpp
-QT = core
+QT = core testlib
 
 include (../xmlpatterns.pri)
diff --git a/tests/auto/qabstractmessagehandler/qabstractmessagehandler.pro b/tests/auto/qabstractmessagehandler/qabstractmessagehandler.pro
index 5c50103..82795c2 100644
--- a/tests/auto/qabstractmessagehandler/qabstractmessagehandler.pro
+++ b/tests/auto/qabstractmessagehandler/qabstractmessagehandler.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
+TARGET = tst_qabstractmessagehandler
+CONFIG += testcase
 SOURCES += tst_qabstractmessagehandler.cpp
-QT = core
+QT = core testlib
 
 include (../xmlpatterns.pri)
diff --git a/tests/auto/qabstracturiresolver/qabstracturiresolver.pro b/tests/auto/qabstracturiresolver/qabstracturiresolver.pro
index 0d76208..6ac2df8 100644
--- a/tests/auto/qabstracturiresolver/qabstracturiresolver.pro
+++ b/tests/auto/qabstracturiresolver/qabstracturiresolver.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+TARGET = tst_qabstracturiresolver
+CONFIG += testcase
 SOURCES += tst_qabstracturiresolver.cpp
 HEADERS += TestURIResolver.h
-QT = core
+QT = core testlib
 
 include (../xmlpatterns.pri)
diff --git a/tests/auto/qabstractxmlforwarditerator/qabstractxmlforwarditerator.pro b/tests/auto/qabstractxmlforwarditerator/qabstractxmlforwarditerator.pro
index 6bc0c59..8ba8eb2 100644
--- a/tests/auto/qabstractxmlforwarditerator/qabstractxmlforwarditerator.pro
+++ b/tests/auto/qabstractxmlforwarditerator/qabstractxmlforwarditerator.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
+TARGET = tst_qabstractxmlforwarditerator
+CONFIG += testcase
 SOURCES += tst_qabstractxmlforwarditerator.cpp
-QT = core
+QT = core testlib
 
 include (../xmlpatterns.pri)
diff --git a/tests/auto/qabstractxmlnodemodel/qabstractxmlnodemodel.pro b/tests/auto/qabstractxmlnodemodel/qabstractxmlnodemodel.pro
index b8f509d..261c02a 100644
--- a/tests/auto/qabstractxmlnodemodel/qabstractxmlnodemodel.pro
+++ b/tests/auto/qabstractxmlnodemodel/qabstractxmlnodemodel.pro
@@ -1,4 +1,6 @@
-load(qttest_p4)
+TARGET = tst_qabstractxmlnodemodel
+CONFIG += testcase
+QT += testlib
 SOURCES += tst_qabstractxmlnodemodel.cpp    \
            LoadingModel.cpp                 \
            ../qxmlquery/TestFundament.cpp
diff --git a/tests/auto/qabstractxmlreceiver/qabstractxmlreceiver.pro b/tests/auto/qabstractxmlreceiver/qabstractxmlreceiver.pro
index 2bd2ba4..a436e76 100644
--- a/tests/auto/qabstractxmlreceiver/qabstractxmlreceiver.pro
+++ b/tests/auto/qabstractxmlreceiver/qabstractxmlreceiver.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
+TARGET = tst_qabstractxmlreceiver
+CONFIG += testcase
 SOURCES += tst_qabstractxmlreceiver.cpp
-QT = core
+QT = core testlib
 
 include (../xmlpatterns.pri)
diff --git a/tests/auto/qapplicationargumentparser/qapplicationargumentparser.pro b/tests/auto/qapplicationargumentparser/qapplicationargumentparser.pro
index 80e207f..f970638 100644
--- a/tests/auto/qapplicationargumentparser/qapplicationargumentparser.pro
+++ b/tests/auto/qapplicationargumentparser/qapplicationargumentparser.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+TARGET = tst_qapplicationargumentparser
+CONFIG += testcase
 SOURCES += tst_qapplicationargumentparser.cpp                           \
            ../../../tools/xmlpatterns/qapplicationargument.cpp          \
            ../../../tools/xmlpatterns/qapplicationargumentparser.cpp
-QT -= gui
+QT = core testlib
 INCLUDEPATH += ../../../tools/xmlpatterns/
diff --git a/tests/auto/qautoptr/qautoptr.pro b/tests/auto/qautoptr/qautoptr.pro
index b0c574f..6059f68 100644
--- a/tests/auto/qautoptr/qautoptr.pro
+++ b/tests/auto/qautoptr/qautoptr.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+TARGET = tst_qautoptr
+CONFIG += testcase
 SOURCES += tst_qautoptr.cpp
-QT = core
+QT = core testlib
 include(../xmlpatterns.pri)
diff --git a/tests/auto/qsimplexmlnodemodel/qsimplexmlnodemodel.pro b/tests/auto/qsimplexmlnodemodel/qsimplexmlnodemodel.pro
index f1cd455..c89495b 100644
--- a/tests/auto/qsimplexmlnodemodel/qsimplexmlnodemodel.pro
+++ b/tests/auto/qsimplexmlnodemodel/qsimplexmlnodemodel.pro
@@ -1,4 +1,6 @@
-load(qttest_p4)
+TARGET = tst_qsimplexmlnodemodel
+CONFIG += testcase
+QT += testlib
 SOURCES += tst_qsimplexmlnodemodel.cpp
 HEADERS += TestSimpleNodeModel.h
 include (../xmlpatterns.pri)
diff --git a/tests/auto/qsourcelocation/qsourcelocation.pro b/tests/auto/qsourcelocation/qsourcelocation.pro
index 3cfcb46..3c2c8ea 100644
--- a/tests/auto/qsourcelocation/qsourcelocation.pro
+++ b/tests/auto/qsourcelocation/qsourcelocation.pro
@@ -1,4 +1,6 @@
-load(qttest_p4)
+TARGET = tst_qsourcelocation
+CONFIG += testcase
+QT += testlib
 SOURCES += tst_qsourcelocation.cpp
 
 include (../xmlpatterns.pri)
diff --git a/tests/auto/qxmlformatter/qxmlformatter.pro b/tests/auto/qxmlformatter/qxmlformatter.pro
index bcab0b4..054b3dc 100644
--- a/tests/auto/qxmlformatter/qxmlformatter.pro
+++ b/tests/auto/qxmlformatter/qxmlformatter.pro
@@ -1,4 +1,6 @@
-load(qttest_p4)
+TARGET = tst_qxmlformatter
+CONFIG += testcase
+QT += testlib
 SOURCES += tst_qxmlformatter.cpp
 
 include (../xmlpatterns.pri)
diff --git a/tests/auto/qxmlitem/qxmlitem.pro b/tests/auto/qxmlitem/qxmlitem.pro
index 54c8969..db9c8a1 100644
--- a/tests/auto/qxmlitem/qxmlitem.pro
+++ b/tests/auto/qxmlitem/qxmlitem.pro
@@ -1,4 +1,6 @@
-load(qttest_p4)
+TARGET = tst_qxmlitem
+CONFIG += testcase
+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..5360180 100644
--- a/tests/auto/qxmlname/qxmlname.pro
+++ b/tests/auto/qxmlname/qxmlname.pro
@@ -1,4 +1,6 @@
-load(qttest_p4)
+TARGET = tst_qxmlname
+CONFIG += testcase
+QT += testlib
 SOURCES += tst_qxmlname.cpp
 
 include (../xmlpatterns.pri)
diff --git a/tests/auto/qxmlnamepool/qxmlnamepool.pro b/tests/auto/qxmlnamepool/qxmlnamepool.pro
index 04d1e7a..df75682 100644
--- a/tests/auto/qxmlnamepool/qxmlnamepool.pro
+++ b/tests/auto/qxmlnamepool/qxmlnamepool.pro
@@ -1,4 +1,6 @@
-load(qttest_p4)
+TARGET = tst_qxmlnamepool
+CONFIG += testcase
+QT += testlib
 SOURCES += tst_qxmlnamepool.cpp
 
 include (../xmlpatterns.pri)
diff --git a/tests/auto/qxmlnodemodelindex/qxmlnodemodelindex.pro b/tests/auto/qxmlnodemodelindex/qxmlnodemodelindex.pro
index 73a5b00..4c9fbc1 100644
--- a/tests/auto/qxmlnodemodelindex/qxmlnodemodelindex.pro
+++ b/tests/auto/qxmlnodemodelindex/qxmlnodemodelindex.pro
@@ -1,4 +1,6 @@
-load(qttest_p4)
+TARGET = tst_qxmlnodemodelindex
+CONFIG += testcase
+QT += testlib
 SOURCES += tst_qxmlnodemodelindex.cpp
 
 include (../xmlpatterns.pri)
diff --git a/tests/auto/qxmlquery/qxmlquery.pro b/tests/auto/qxmlquery/qxmlquery.pro
index d5e8228..48cf8d4 100644
--- a/tests/auto/qxmlquery/qxmlquery.pro
+++ b/tests/auto/qxmlquery/qxmlquery.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+TARGET = tst_qxmlquery
+CONFIG += testcase
 SOURCES += tst_qxmlquery.cpp MessageValidator.cpp TestFundament.cpp
 HEADERS += PushBaseliner.h                              \
            MessageSilencer.h                            \
@@ -8,7 +9,7 @@ HEADERS += PushBaseliner.h                              \
 
 RESOURCES = input.qrc
 
-QT += network
+QT += network testlib
 
 wince* {
     DEFINES += SRCDIR=\\\"./\\\"
diff --git a/tests/auto/qxmlresultitems/qxmlresultitems.pro b/tests/auto/qxmlresultitems/qxmlresultitems.pro
index 7d74c20..30eb0cb 100644
--- a/tests/auto/qxmlresultitems/qxmlresultitems.pro
+++ b/tests/auto/qxmlresultitems/qxmlresultitems.pro
@@ -1,4 +1,6 @@
-load(qttest_p4)
+TARGET = tst_qxmlresultitems
+CONFIG += testcase
+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..2543a6c 100644
--- a/tests/auto/qxmlschema/qxmlschema.pro
+++ b/tests/auto/qxmlschema/qxmlschema.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
+TARGET = tst_qxmlschema
+CONFIG += testcase
 SOURCES += tst_qxmlschema.cpp
-QT += network
+QT += network testlib
 
 include (../xmlpatterns.pri)
diff --git a/tests/auto/qxmlschemavalidator/qxmlschemavalidator.pro b/tests/auto/qxmlschemavalidator/qxmlschemavalidator.pro
index 0b439d7..343fa73 100644
--- a/tests/auto/qxmlschemavalidator/qxmlschemavalidator.pro
+++ b/tests/auto/qxmlschemavalidator/qxmlschemavalidator.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
+TARGET = tst_qxmlschemavalidator
+CONFIG += testcase
 SOURCES += tst_qxmlschemavalidator.cpp
-QT += network
+QT += network testlib
 
 include (../xmlpatterns.pri)
diff --git a/tests/auto/qxmlserializer/qxmlserializer.pro b/tests/auto/qxmlserializer/qxmlserializer.pro
index bc957c2..a1e477b 100644
--- a/tests/auto/qxmlserializer/qxmlserializer.pro
+++ b/tests/auto/qxmlserializer/qxmlserializer.pro
@@ -1,4 +1,6 @@
-load(qttest_p4)
+TARGET = tst_qxmlserializer
+CONFIG += testcase
+QT += testlib
 SOURCES += tst_qxmlserializer.cpp
 
 include (../xmlpatterns.pri)
diff --git a/tests/auto/xmlpatterns/xmlpatterns.pro b/tests/auto/xmlpatterns/xmlpatterns.pro
index 54dd9aa..74678c3 100644
--- a/tests/auto/xmlpatterns/xmlpatterns.pro
+++ b/tests/auto/xmlpatterns/xmlpatterns.pro
@@ -1,4 +1,6 @@
-load(qttest_p4)
+TARGET = tst_xmlpatterns
+CONFIG += testcase
+QT += testlib
 SOURCES += tst_xmlpatterns.cpp \
            ../qxmlquery/TestFundament.cpp
 
diff --git a/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro b/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro
index 2db9dbd..6db7e36 100644
--- a/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro
+++ b/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+TARGET = tst_xmlpatternsdiagnosticsts
+CONFIG += testcase
 SOURCES += tst_xmlpatternsdiagnosticsts.cpp \
            ../qxmlquery/TestFundament.cpp
 
@@ -10,7 +11,7 @@ HEADERS += ../xmlpatternsxqts/tst_suitetest.h
 SOURCES += ../xmlpatternsxqts/tst_suitetest.cpp
 LIBS += -l$$XMLPATTERNS_SDK
 
-QT += xml
+QT += xml testlib
 
 INCLUDEPATH += $$(QTSRCDIR)/tests/auto/xmlpatternssdk  \
                $$(QTDIR)/include/QtXmlPatterns/private \
diff --git a/tests/auto/xmlpatternsschema/xmlpatternsschema.pro b/tests/auto/xmlpatternsschema/xmlpatternsschema.pro
index 734ac26..df0853b 100644
--- a/tests/auto/xmlpatternsschema/xmlpatternsschema.pro
+++ b/tests/auto/xmlpatternsschema/xmlpatternsschema.pro
@@ -1,4 +1,6 @@
-load(qttest_p4)
+TARGET = tst_xmlpatternsschema
+CONFIG += testcase
+QT += testlib
 load(qt_module)
 
 SOURCES += tst_xmlpatternsschema.cpp \
diff --git a/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro b/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro
index 44766a9..d827c1a 100644
--- a/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro
+++ b/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+TARGET = tst_xmlpatternsschemats
+CONFIG += testcase
 SOURCES += tst_xmlpatternsschemats.cpp \
            ../qxmlquery/TestFundament.cpp
 
@@ -16,7 +17,7 @@ if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
 
 LIBS += -l$$PATTERNIST_SDK
 
-QT += xml
+QT += xml testlib
 
 INCLUDEPATH += $$QT_SOURCE_TREE/tests/auto/xmlpatternssdk/   \
                $$QT_BUILD_TREE/include/QtXmlPatterns/private \
diff --git a/tests/auto/xmlpatternsvalidator/xmlpatternsvalidator.pro b/tests/auto/xmlpatternsvalidator/xmlpatternsvalidator.pro
index 7091840..55c4ec0 100644
--- a/tests/auto/xmlpatternsvalidator/xmlpatternsvalidator.pro
+++ b/tests/auto/xmlpatternsvalidator/xmlpatternsvalidator.pro
@@ -1,4 +1,6 @@
-load(qttest_p4)
+TARGET = tst_xmlpatternsvalidator
+CONFIG += testcase
+QT += testlib
 SOURCES += tst_xmlpatternsvalidator.cpp \
            ../qxmlquery/TestFundament.cpp
 
diff --git a/tests/auto/xmlpatternsview/xmlpatternsview.pro b/tests/auto/xmlpatternsview/xmlpatternsview.pro
index 5ab0f0e..875d221 100644
--- a/tests/auto/xmlpatternsview/xmlpatternsview.pro
+++ b/tests/auto/xmlpatternsview/xmlpatternsview.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+QT += testlib
 SOURCES += tst_xmlpatternsview.cpp
 
 include (../xmlpatterns.pri)
diff --git a/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro b/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro
index 1fb7539..72607a4 100644
--- a/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro
+++ b/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro
@@ -1,4 +1,4 @@
-load(qttest_p4)
+CONFIG += testcase
 SOURCES += tst_xmlpatternsxqts.cpp ../qxmlquery/TestFundament.cpp tst_suitetest.cpp
 
 include(../xmlpatterns.pri)
@@ -14,6 +14,5 @@ INCLUDEPATH += $$(QTDIR)/include/QtXmlPatterns/private      \
                $$(QTDIR)/tools/xmlpatterns                  \
                ../xmlpatternssdk/
 
-CONFIG += testlib
-QT += xml
+QT += xml testlib
 TARGET = tst_xmlpatternsxqts
diff --git a/tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro b/tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro
index 2bb8844..e72960c 100644
--- a/tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro
+++ b/tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+TARGET = tst_xmlpatternsxslts
+CONFIG += testcase
 SOURCES += tst_xmlpatternsxslts.cpp \
            ../qxmlquery/TestFundament.cpp
 
@@ -8,7 +9,7 @@ HEADERS += ../xmlpatternsxqts/tst_suitetest.h
 SOURCES += ../xmlpatternsxqts/tst_suitetest.cpp
 LIBS += -l$$XMLPATTERNS_SDK
 
-QT += xml
+QT += xml testlib
 INCLUDEPATH += $$(QTSRCDIR)/tests/auto/xmlpatternssdk  \
                $$(QTDIR)/include/QtXmlPatterns/private \
                $$(QTSRCDIR)/tests/auto/xmlpatternsxqts \