corelib: 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: I7c1ffe9c8c294dbdc988e1582e580b1ed3f4593e
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>

19 files changed, 54 insertions, 39 deletions

diff --git a/tests/auto/corelib/io/qabstractfileengine/qabstractfileengine.pro b/tests/auto/corelib/io/qabstractfileengine/qabstractfileengine.pro
index 870473a4cb..d498b530bc 100644
--- a/tests/auto/corelib/io/qabstractfileengine/qabstractfileengine.pro
+++ b/tests/auto/corelib/io/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/corelib/io/qbuffer/qbuffer.pro b/tests/auto/corelib/io/qbuffer/qbuffer.pro
index b768eb82d8..9745fcd862 100644
--- a/tests/auto/corelib/io/qbuffer/qbuffer.pro
+++ b/tests/auto/corelib/io/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/corelib/io/qdatastream/qdatastream.pro b/tests/auto/corelib/io/qdatastream/qdatastream.pro
index 5d80b4f65c..2cb4282296 100644
--- a/tests/auto/corelib/io/qdatastream/qdatastream.pro
+++ b/tests/auto/corelib/io/qdatastream/qdatastream.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qdatastream
 SOURCES += tst_qdatastream.cpp
-QT += gui widgets
+QT += gui widgets testlib
 wince*: {
    addFiles.files = datastream.q42
    addFiles.path = .
diff --git a/tests/auto/corelib/io/qdebug/qdebug.pro b/tests/auto/corelib/io/qdebug/qdebug.pro
index 2b5716860c..b6a91a7703 100644
--- a/tests/auto/corelib/io/qdebug/qdebug.pro
+++ b/tests/auto/corelib/io/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/corelib/io/qdir/qdir.pro b/tests/auto/corelib/io/qdir/qdir.pro
index 3f63978970..44cf644b37 100644
--- a/tests/auto/corelib/io/qdir/qdir.pro
+++ b/tests/auto/corelib/io/qdir/qdir.pro
@@ -1,7 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qdir
 SOURCES   += tst_qdir.cpp
 RESOURCES += qdir.qrc
-QT        = core
+QT        = core testlib
 
 wince* {
   DirFiles.files = testdir testData searchdir resources entrylist types tst_qdir.cpp
diff --git a/tests/auto/corelib/io/qdiriterator/qdiriterator.pro b/tests/auto/corelib/io/qdiriterator/qdiriterator.pro
index f9f5c8d664..ec9065bf19 100644
--- a/tests/auto/corelib/io/qdiriterator/qdiriterator.pro
+++ b/tests/auto/corelib/io/qdiriterator/qdiriterator.pro
@@ -1,7 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qdiriterator
 SOURCES  += tst_qdiriterator.cpp
 RESOURCES      += qdiriterator.qrc
-QT = core
+QT = core testlib
 
 wince*mips*|wincewm50smart-msvc200*: DEFINES += WINCE_BROKEN_ITERATE=1
 
diff --git a/tests/auto/corelib/io/qfile/largefile/largefile.pro b/tests/auto/corelib/io/qfile/largefile/largefile.pro
index 7786bdb892..5b5cf49f86 100644
--- a/tests/auto/corelib/io/qfile/largefile/largefile.pro
+++ b/tests/auto/corelib/io/qfile/largefile/largefile.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_largefile
 
-QT = core
+QT = core testlib
 SOURCES += tst_largefile.cpp
 
 wince*: SOURCES += $$QT_SOURCE_TREE/src/corelib/kernel/qfunctions_wince.cpp
diff --git a/tests/auto/corelib/io/qfile/test/test.pro b/tests/auto/corelib/io/qfile/test/test.pro
index 366432c57e..44dd20cf50 100644
--- a/tests/auto/corelib/io/qfile/test/test.pro
+++ b/tests/auto/corelib/io/qfile/test/test.pro
@@ -1,8 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
 SOURCES  += ../tst_qfile.cpp
 
 wince* {
-    QT = core gui
+    QT = core gui testlib
     files.files += ..\\dosfile.txt ..\\noendofline.txt ..\\testfile.txt \
                      ..\\testlog.txt ..\\two.dots.file ..\\tst_qfile.cpp \
                      ..\\Makefile ..\\forCopying.txt ..\\forRenaming.txt
@@ -17,7 +17,7 @@ wince* {
     SOURCES += $$QT_SOURCE_TREE/src/corelib/kernel/qfunctions_wince.cpp     # needed for QT_OPEN
     DEFINES += SRCDIR=\\\"\\\"
 } else {
-    QT = core network
+    QT = core network testlib
     DEFINES += SRCDIR=\\\"$$PWD/../\\\"
 }
 
diff --git a/tests/auto/corelib/io/qfileinfo/qfileinfo.pro b/tests/auto/corelib/io/qfileinfo/qfileinfo.pro
index c3b9f4c2e3..42a045dc23 100644
--- a/tests/auto/corelib/io/qfileinfo/qfileinfo.pro
+++ b/tests/auto/corelib/io/qfileinfo/qfileinfo.pro
@@ -1,7 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qfileinfo
 SOURCES  += tst_qfileinfo.cpp
 
-QT = core-private
+QT = core-private testlib
 
 
 RESOURCES      += qfileinfo.qrc
diff --git a/tests/auto/corelib/io/qfilesystementry/qfilesystementry.pro b/tests/auto/corelib/io/qfilesystementry/qfilesystementry.pro
index 992c90cfcc..7990bb69c3 100644
--- a/tests/auto/corelib/io/qfilesystementry/qfilesystementry.pro
+++ b/tests/auto/corelib/io/qfilesystementry/qfilesystementry.pro
@@ -1,8 +1,9 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qfilesystementry
 
 SOURCES   += tst_qfilesystementry.cpp \
     $${QT.core.sources}/io/qfilesystementry.cpp
 HEADERS += $${QT.core.sources}/io/qfilesystementry_p.h
-QT = core core-private
+QT = core core-private testlib
 
 CONFIG += parallel_test
diff --git a/tests/auto/corelib/io/qfilesystemwatcher/qfilesystemwatcher.pro b/tests/auto/corelib/io/qfilesystemwatcher/qfilesystemwatcher.pro
index d3549b2f05..b7ba6d260e 100644
--- a/tests/auto/corelib/io/qfilesystemwatcher/qfilesystemwatcher.pro
+++ b/tests/auto/corelib/io/qfilesystemwatcher/qfilesystemwatcher.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qfilesystemwatcher
 SOURCES += tst_qfilesystemwatcher.cpp
-QT = core
+QT = core testlib
 
 CONFIG += parallel_test
 CONFIG += insignificant_test
diff --git a/tests/auto/corelib/io/qiodevice/qiodevice.pro b/tests/auto/corelib/io/qiodevice/qiodevice.pro
index 0d580b824c..7ef227dd57 100644
--- a/tests/auto/corelib/io/qiodevice/qiodevice.pro
+++ b/tests/auto/corelib/io/qiodevice/qiodevice.pro
@@ -1,7 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qiodevice
 SOURCES  += tst_qiodevice.cpp
 
-QT = core network
+QT = core network testlib
 
 wince*: {
    addFiles.files = tst_qiodevice.cpp
diff --git a/tests/auto/corelib/io/qprocess/test/test.pro b/tests/auto/corelib/io/qprocess/test/test.pro
index 5581077387..3bac7eae3d 100644
--- a/tests/auto/corelib/io/qprocess/test/test.pro
+++ b/tests/auto/corelib/io/qprocess/test/test.pro
@@ -1,4 +1,4 @@
-load(qttest_p4)
+CONFIG += testcase
 
 SOURCES += ../tst_qprocess.cpp
 !wince*: {
@@ -17,7 +17,7 @@ win32: {
 
 
 
-QT = core
+QT = core testlib
 QT += network
 
 embedded: QT += gui
diff --git a/tests/auto/corelib/io/qprocessenvironment/qprocessenvironment.pro b/tests/auto/corelib/io/qprocessenvironment/qprocessenvironment.pro
index 60dba50813..b05b8a5265 100644
--- a/tests/auto/corelib/io/qprocessenvironment/qprocessenvironment.pro
+++ b/tests/auto/corelib/io/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/corelib/io/qresourceengine/qresourceengine.pro b/tests/auto/corelib/io/qresourceengine/qresourceengine.pro
index 09509ecf08..e8c6f36c6c 100644
--- a/tests/auto/corelib/io/qresourceengine/qresourceengine.pro
+++ b/tests/auto/corelib/io/qresourceengine/qresourceengine.pro
@@ -2,7 +2,7 @@
 # Automatically generated by qmake (2.00a) ma 2. mai 16:14:33 2005
 ######################################################################
 
-load(qttest_p4)
+CONFIG += testcase
 load(resources)
 
 # Input
@@ -15,7 +15,7 @@ runtime_resource.commands = $$QMAKE_RCC -root /runtime_resource/ -binary $${runt
 QMAKE_EXTRA_TARGETS = runtime_resource
 PRE_TARGETDEPS += $${runtime_resource.target}
 
-QT = core
+QT = core testlib
 wince* {
     deploy.files += runtime_resource.rcc parentdir.txt
     test.files = testqrc/*
diff --git a/tests/auto/corelib/io/qsettings/qsettings.pro b/tests/auto/corelib/io/qsettings/qsettings.pro
index f15e40b267..ac85ea8f41 100644
--- a/tests/auto/corelib/io/qsettings/qsettings.pro
+++ b/tests/auto/corelib/io/qsettings/qsettings.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qsettings
 
-QT += core-private
+QT += core-private testlib
 
 SOURCES  += tst_qsettings.cpp
 RESOURCES += qsettings.qrc
diff --git a/tests/auto/corelib/io/qtemporaryfile/qtemporaryfile.pro b/tests/auto/corelib/io/qtemporaryfile/qtemporaryfile.pro
index dda224ca78..0c43b9c39c 100644
--- a/tests/auto/corelib/io/qtemporaryfile/qtemporaryfile.pro
+++ b/tests/auto/corelib/io/qtemporaryfile/qtemporaryfile.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qtemporaryfile
 SOURCES       += tst_qtemporaryfile.cpp
-QT = core
+QT = core testlib
 
 DEFINES += SRCDIR=\\\"$$PWD/\\\"
 
diff --git a/tests/auto/corelib/io/qtextstream/test/test.pro b/tests/auto/corelib/io/qtextstream/test/test.pro
index 79252b2c5f..8a0c9d4fb1 100644
--- a/tests/auto/corelib/io/qtextstream/test/test.pro
+++ b/tests/auto/corelib/io/qtextstream/test/test.pro
@@ -1,4 +1,4 @@
-load(qttest_p4)
+CONFIG += testcase
 SOURCES  += ../tst_qtextstream.cpp
 
 TARGET = ../tst_qtextstream
@@ -13,7 +13,7 @@ win32 {
 
 RESOURCES += ../qtextstream.qrc
 
-QT = core network
+QT = core network testlib
 
 wince* {
     addFiles.files = ../rfc3261.txt ../shift-jis.txt ../task113817.txt ../qtextstream.qrc ../tst_qtextstream.cpp
diff --git a/tests/auto/corelib/io/qurl/qurl.pro b/tests/auto/corelib/io/qurl/qurl.pro
index e6976e3c21..99aeb56d37 100644
--- a/tests/auto/corelib/io/qurl/qurl.pro
+++ b/tests/auto/corelib/io/qurl/qurl.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qurl
 SOURCES  += tst_qurl.cpp
-QT = core core-private
+QT = core core-private testlib
 CONFIG += parallel_test