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

23 files changed, 69 insertions, 53 deletions

diff --git a/tests/auto/gui/text/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro b/tests/auto/gui/text/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro
index 22b013e37e..025b3f8a26 100644
--- a/tests/auto/gui/text/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro
+++ b/tests/auto/gui/text/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro
@@ -2,8 +2,9 @@
 # Project file for autotest for file qabstracttextdocumentlayout.h
 ############################################################
 
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qabstracttextdocumentlayout
+QT += widgets testlib
 SOURCES += tst_qabstracttextdocumentlayout.cpp
 
 
diff --git a/tests/auto/gui/text/qcssparser/qcssparser.pro b/tests/auto/gui/text/qcssparser/qcssparser.pro
index 14070a5215..d8d275a377 100644
--- a/tests/auto/gui/text/qcssparser/qcssparser.pro
+++ b/tests/auto/gui/text/qcssparser/qcssparser.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qcssparser
 SOURCES += tst_qcssparser.cpp
-QT += xml gui-private
+QT += xml gui-private testlib
 
 requires(contains(QT_CONFIG,private_tests))
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/gui/text/qfont/qfont.pro b/tests/auto/gui/text/qfont/qfont.pro
index 891cb0a093..6d5b3bc9de 100644
--- a/tests/auto/gui/text/qfont/qfont.pro
+++ b/tests/auto/gui/text/qfont/qfont.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qfont
+QT += widgets testlib
 SOURCES  += tst_qfont.cpp
 
 
diff --git a/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro b/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro
index 4abff18412..08442cc0ad 100644
--- a/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro
+++ b/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro
@@ -1,6 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qfontdatabase
 SOURCES  += tst_qfontdatabase.cpp
 DEFINES += SRCDIR=\\\"$$PWD\\\"
+QT += testlib
 
 wince* {
     additionalFiles.files = FreeMono.ttf
diff --git a/tests/auto/gui/text/qfontmetrics/qfontmetrics.pro b/tests/auto/gui/text/qfontmetrics/qfontmetrics.pro
index c0dc1abbe6..a636651724 100644
--- a/tests/auto/gui/text/qfontmetrics/qfontmetrics.pro
+++ b/tests/auto/gui/text/qfontmetrics/qfontmetrics.pro
@@ -1,4 +1,6 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qfontmetrics
+QT += testlib
 SOURCES  += tst_qfontmetrics.cpp
 RESOURCES += testfont.qrc
 
diff --git a/tests/auto/gui/text/qglyphrun/qglyphrun.pro b/tests/auto/gui/text/qglyphrun/qglyphrun.pro
index 9d3c6253e0..acdff0584f 100644
--- a/tests/auto/gui/text/qglyphrun/qglyphrun.pro
+++ b/tests/auto/gui/text/qglyphrun/qglyphrun.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT = core gui
+CONFIG += testcase
+TARGET = tst_qglyphrun
+QT = core gui testlib
 
 SOURCES += \
     tst_qglyphrun.cpp
diff --git a/tests/auto/gui/text/qrawfont/qrawfont.pro b/tests/auto/gui/text/qrawfont/qrawfont.pro
index 3bb3dcee40..450ef327b5 100644
--- a/tests/auto/gui/text/qrawfont/qrawfont.pro
+++ b/tests/auto/gui/text/qrawfont/qrawfont.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qrawfont
 
-QT = core core-private gui gui-private
+QT = core core-private gui gui-private testlib
 
 SOURCES += \
     tst_qrawfont.cpp
diff --git a/tests/auto/gui/text/qstatictext/qstatictext.pro b/tests/auto/gui/text/qstatictext/qstatictext.pro
index a8398dccf9..19ac6cec13 100644
--- a/tests/auto/gui/text/qstatictext/qstatictext.pro
+++ b/tests/auto/gui/text/qstatictext/qstatictext.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets widgets-private
+CONFIG += testcase
+TARGET = tst_qstatictext
+QT += widgets widgets-private testlib
 QT += core core-private gui gui-private
 SOURCES  += tst_qstatictext.cpp
 
diff --git a/tests/auto/gui/text/qsyntaxhighlighter/qsyntaxhighlighter.pro b/tests/auto/gui/text/qsyntaxhighlighter/qsyntaxhighlighter.pro
index 30fb3a5283..14f5add8cc 100644
--- a/tests/auto/gui/text/qsyntaxhighlighter/qsyntaxhighlighter.pro
+++ b/tests/auto/gui/text/qsyntaxhighlighter/qsyntaxhighlighter.pro
@@ -1,4 +1,4 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qsyntaxhighlighter
 SOURCES += tst_qsyntaxhighlighter.cpp
-
-
+QT += testlib
diff --git a/tests/auto/gui/text/qtextblock/qtextblock.pro b/tests/auto/gui/text/qtextblock/qtextblock.pro
index d50ef5ca78..cad009a35a 100644
--- a/tests/auto/gui/text/qtextblock/qtextblock.pro
+++ b/tests/auto/gui/text/qtextblock/qtextblock.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qtextblock
 
-QT += widgets widgets-private
+QT += widgets widgets-private testlib
 QT += core-private gui-private
 
 SOURCES  += tst_qtextblock.cpp
diff --git a/tests/auto/gui/text/qtextcursor/qtextcursor.pro b/tests/auto/gui/text/qtextcursor/qtextcursor.pro
index 828b90ca16..bae85d9c37 100644
--- a/tests/auto/gui/text/qtextcursor/qtextcursor.pro
+++ b/tests/auto/gui/text/qtextcursor/qtextcursor.pro
@@ -1,5 +1,4 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qtextcursor
 SOURCES  += tst_qtextcursor.cpp
-
-
-
+QT += testlib
diff --git a/tests/auto/gui/text/qtextdocument/qtextdocument.pro b/tests/auto/gui/text/qtextdocument/qtextdocument.pro
index 69517589cc..1f06e297f2 100644
--- a/tests/auto/gui/text/qtextdocument/qtextdocument.pro
+++ b/tests/auto/gui/text/qtextdocument/qtextdocument.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += core-private gui-private xml
+CONFIG += testcase
+TARGET = tst_qtextdocument
+QT += core-private gui-private xml testlib
 HEADERS += common.h
 SOURCES += tst_qtextdocument.cpp 
 
diff --git a/tests/auto/gui/text/qtextdocumentfragment/qtextdocumentfragment.pro b/tests/auto/gui/text/qtextdocumentfragment/qtextdocumentfragment.pro
index e6ddd45f85..da8d120c69 100644
--- a/tests/auto/gui/text/qtextdocumentfragment/qtextdocumentfragment.pro
+++ b/tests/auto/gui/text/qtextdocumentfragment/qtextdocumentfragment.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qtextdocumentfragment
 
-QT += core-private gui-private
+QT += core-private gui-private testlib
 
 SOURCES  += tst_qtextdocumentfragment.cpp
 
diff --git a/tests/auto/gui/text/qtextdocumentlayout/qtextdocumentlayout.pro b/tests/auto/gui/text/qtextdocumentlayout/qtextdocumentlayout.pro
index 32b05ce061..505ca8a2bd 100644
--- a/tests/auto/gui/text/qtextdocumentlayout/qtextdocumentlayout.pro
+++ b/tests/auto/gui/text/qtextdocumentlayout/qtextdocumentlayout.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qtextdocumentlayout
+QT += widgets testlib
 SOURCES += tst_qtextdocumentlayout.cpp
 
 
diff --git a/tests/auto/gui/text/qtextformat/qtextformat.pro b/tests/auto/gui/text/qtextformat/qtextformat.pro
index 30f6e50c61..f810a3bb64 100644
--- a/tests/auto/gui/text/qtextformat/qtextformat.pro
+++ b/tests/auto/gui/text/qtextformat/qtextformat.pro
@@ -1,9 +1,4 @@
-############################################################
-# Project file for autotest for file qtextformat.h
-############################################################
-
-load(qttest_p4)
-
+CONFIG += testcase
+TARGET = tst_qtextformat
+QT += testlib
 SOURCES += tst_qtextformat.cpp
-
-
diff --git a/tests/auto/gui/text/qtextlayout/qtextlayout.pro b/tests/auto/gui/text/qtextlayout/qtextlayout.pro
index 4498ec02a1..f35239bc6a 100644
--- a/tests/auto/gui/text/qtextlayout/qtextlayout.pro
+++ b/tests/auto/gui/text/qtextlayout/qtextlayout.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += core-private gui-private
+CONFIG += testcase
+TARGET = tst_qtextlayout
+QT += core-private gui-private testlib
 HEADERS += 
 SOURCES += tst_qtextlayout.cpp 
 DEFINES += QT_COMPILES_IN_HARFBUZZ
diff --git a/tests/auto/gui/text/qtextlist/qtextlist.pro b/tests/auto/gui/text/qtextlist/qtextlist.pro
index f66fb96dd0..e9ca3ad0a0 100644
--- a/tests/auto/gui/text/qtextlist/qtextlist.pro
+++ b/tests/auto/gui/text/qtextlist/qtextlist.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qtextlist
 
-QT += core-private gui-private
+QT += core-private gui-private testlib
 
 SOURCES  += tst_qtextlist.cpp
 HEADERS += ../qtextdocument/common.h
diff --git a/tests/auto/gui/text/qtextobject/qtextobject.pro b/tests/auto/gui/text/qtextobject/qtextobject.pro
index e87a364ab6..02ae3ae758 100644
--- a/tests/auto/gui/text/qtextobject/qtextobject.pro
+++ b/tests/auto/gui/text/qtextobject/qtextobject.pro
@@ -2,8 +2,9 @@
 # Project file for autotest for file qtextobject.h
 ############################################################
 
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qtextobject
+QT += widgets testlib
 SOURCES += tst_qtextobject.cpp
 
 
diff --git a/tests/auto/gui/text/qtextodfwriter/qtextodfwriter.pro b/tests/auto/gui/text/qtextodfwriter/qtextodfwriter.pro
index 32913a9c17..2c8bb39f6d 100644
--- a/tests/auto/gui/text/qtextodfwriter/qtextodfwriter.pro
+++ b/tests/auto/gui/text/qtextodfwriter/qtextodfwriter.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += core-private gui-private
+CONFIG += testcase
+TARGET = tst_qtextodfwriter
+QT += core-private gui-private testlib
 SOURCES += tst_qtextodfwriter.cpp
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/gui/text/qtextpiecetable/qtextpiecetable.pro b/tests/auto/gui/text/qtextpiecetable/qtextpiecetable.pro
index cfbbe2bca5..930d18f5fe 100644
--- a/tests/auto/gui/text/qtextpiecetable/qtextpiecetable.pro
+++ b/tests/auto/gui/text/qtextpiecetable/qtextpiecetable.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets widgets-private
+CONFIG += testcase
+TARGET = tst_qtextpiecetable
+QT += widgets widgets-private testlib
 QT += core-private gui-private
 SOURCES  += tst_qtextpiecetable.cpp
 HEADERS += ../qtextdocument/common.h
diff --git a/tests/auto/gui/text/qtextscriptengine/qtextscriptengine.pro b/tests/auto/gui/text/qtextscriptengine/qtextscriptengine.pro
index 0f5076e2ed..6dcb1b44a0 100644
--- a/tests/auto/gui/text/qtextscriptengine/qtextscriptengine.pro
+++ b/tests/auto/gui/text/qtextscriptengine/qtextscriptengine.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qtextscriptengine
 
-QT += core-private gui-private
+QT += core-private gui-private testlib
 
 HEADERS += 
 SOURCES += tst_qtextscriptengine.cpp 
diff --git a/tests/auto/gui/text/qtexttable/qtexttable.pro b/tests/auto/gui/text/qtexttable/qtexttable.pro
index 611b706fc4..88583ff904 100644
--- a/tests/auto/gui/text/qtexttable/qtexttable.pro
+++ b/tests/auto/gui/text/qtexttable/qtexttable.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qtexttable
+QT += widgets testlib
 SOURCES  += tst_qtexttable.cpp
 
 
diff --git a/tests/auto/gui/text/qzip/qzip.pro b/tests/auto/gui/text/qzip/qzip.pro
index 221971c560..309f2167d1 100644
--- a/tests/auto/gui/text/qzip/qzip.pro
+++ b/tests/auto/gui/text/qzip/qzip.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += gui-private
+CONFIG += testcase
+TARGET = tst_qzip
+QT += gui-private testlib
 SOURCES += tst_qzip.cpp
 
 wince* {