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>

14 files changed, 42 insertions, 44 deletions

diff --git a/tests/auto/gui/painting/qbrush/qbrush.pro b/tests/auto/gui/painting/qbrush/qbrush.pro
index 1c3efd46be..2a470c4db1 100644
--- a/tests/auto/gui/painting/qbrush/qbrush.pro
+++ b/tests/auto/gui/painting/qbrush/qbrush.pro
@@ -1,3 +1,4 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qbrush
+QT += widgets testlib
 SOURCES  += tst_qbrush.cpp
diff --git a/tests/auto/gui/painting/qcolor/qcolor.pro b/tests/auto/gui/painting/qcolor/qcolor.pro
index b9d437ef7c..7dba0cec99 100644
--- a/tests/auto/gui/painting/qcolor/qcolor.pro
+++ b/tests/auto/gui/painting/qcolor/qcolor.pro
@@ -1,5 +1,4 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qcolor
 SOURCES  += tst_qcolor.cpp
-
-
-
+QT += testlib
diff --git a/tests/auto/gui/painting/qpaintengine/qpaintengine.pro b/tests/auto/gui/painting/qpaintengine/qpaintengine.pro
index e37c1668ac..810dd81311 100644
--- a/tests/auto/gui/painting/qpaintengine/qpaintengine.pro
+++ b/tests/auto/gui/painting/qpaintengine/qpaintengine.pro
@@ -1,9 +1,4 @@
-############################################################
-# Project file for autotest for file qpaintengine.h
-############################################################
-
-load(qttest_p4)
-
+CONFIG += testcase
+TARGET = tst_qpaintengine
 SOURCES += tst_qpaintengine.cpp
-
-
+QT += testlib
diff --git a/tests/auto/gui/painting/qpainter/qpainter.pro b/tests/auto/gui/painting/qpainter/qpainter.pro
index 23cb5db16e..716d70c7f5 100644
--- a/tests/auto/gui/painting/qpainter/qpainter.pro
+++ b/tests/auto/gui/painting/qpainter/qpainter.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qpainter
 
-QT += widgets widgets-private printsupport
+QT += widgets widgets-private printsupport testlib
 
 SOURCES  += tst_qpainter.cpp
 wince* {
diff --git a/tests/auto/gui/painting/qpainterpath/qpainterpath.pro b/tests/auto/gui/painting/qpainterpath/qpainterpath.pro
index 9708222c99..0c0fe8951a 100644
--- a/tests/auto/gui/painting/qpainterpath/qpainterpath.pro
+++ b/tests/auto/gui/painting/qpainterpath/qpainterpath.pro
@@ -1,5 +1,4 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qpainterpath
 SOURCES  += tst_qpainterpath.cpp
-
-
-
+QT += testlib
diff --git a/tests/auto/gui/painting/qpainterpathstroker/qpainterpathstroker.pro b/tests/auto/gui/painting/qpainterpathstroker/qpainterpathstroker.pro
index b6f62a2eee..218183da3d 100644
--- a/tests/auto/gui/painting/qpainterpathstroker/qpainterpathstroker.pro
+++ b/tests/auto/gui/painting/qpainterpathstroker/qpainterpathstroker.pro
@@ -1,5 +1,4 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qpainterpathstroker
 SOURCES  += tst_qpainterpathstroker.cpp
-
-
-
+QT += testlib
diff --git a/tests/auto/gui/painting/qpathclipper/qpathclipper.pro b/tests/auto/gui/painting/qpathclipper/qpathclipper.pro
index 319dcb3981..e8a3b8a35d 100644
--- a/tests/auto/gui/painting/qpathclipper/qpathclipper.pro
+++ b/tests/auto/gui/painting/qpathclipper/qpathclipper.pro
@@ -1,8 +1,9 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qpathclipper
 INCLUDEPATH += .
 HEADERS += paths.h
 SOURCES  += tst_qpathclipper.cpp paths.cpp
-QT += gui-private
+QT += gui-private testlib
 
 requires(contains(QT_CONFIG,private_tests))
 
diff --git a/tests/auto/gui/painting/qpen/qpen.pro b/tests/auto/gui/painting/qpen/qpen.pro
index 53bd5e2b6e..762b8f47d4 100644
--- a/tests/auto/gui/painting/qpen/qpen.pro
+++ b/tests/auto/gui/painting/qpen/qpen.pro
@@ -1,5 +1,4 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qpen
 SOURCES  += tst_qpen.cpp
-
-
-
+QT += testlib
diff --git a/tests/auto/gui/painting/qpolygon/qpolygon.pro b/tests/auto/gui/painting/qpolygon/qpolygon.pro
index 1d5702821c..869fbd30c5 100644
--- a/tests/auto/gui/painting/qpolygon/qpolygon.pro
+++ b/tests/auto/gui/painting/qpolygon/qpolygon.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qpolygon
+QT += widgets testlib
 SOURCES  += tst_qpolygon.cpp
 
 unix:!mac:LIBS+=-lm
diff --git a/tests/auto/gui/painting/qprinter/qprinter.pro b/tests/auto/gui/painting/qprinter/qprinter.pro
index da02bdd7d6..fd01471d5b 100644
--- a/tests/auto/gui/painting/qprinter/qprinter.pro
+++ b/tests/auto/gui/painting/qprinter/qprinter.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += printsupport widgets
+CONFIG += testcase
+TARGET = tst_qprinter
+QT += printsupport widgets testlib
 SOURCES  += tst_qprinter.cpp
 
 mac*:CONFIG+=insignificant_test
diff --git a/tests/auto/gui/painting/qprinterinfo/qprinterinfo.pro b/tests/auto/gui/painting/qprinterinfo/qprinterinfo.pro
index 8c96e2dcb7..6c89d645ae 100644
--- a/tests/auto/gui/painting/qprinterinfo/qprinterinfo.pro
+++ b/tests/auto/gui/painting/qprinterinfo/qprinterinfo.pro
@@ -1,7 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qprinterinfo
 SOURCES  += tst_qprinterinfo.cpp
 
-QT += printsupport network
+QT += printsupport network testlib
 
 DEFINES += QT_USE_USING_NAMESPACE
 
diff --git a/tests/auto/gui/painting/qregion/qregion.pro b/tests/auto/gui/painting/qregion/qregion.pro
index 8dbb4844a0..e9dff9a32e 100644
--- a/tests/auto/gui/painting/qregion/qregion.pro
+++ b/tests/auto/gui/painting/qregion/qregion.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qregion
 
-QT += gui-private
+QT += gui-private testlib
 
 SOURCES  += tst_qregion.cpp
 
diff --git a/tests/auto/gui/painting/qtransform/qtransform.pro b/tests/auto/gui/painting/qtransform/qtransform.pro
index 7cba3dbb52..79ac236b4d 100644
--- a/tests/auto/gui/painting/qtransform/qtransform.pro
+++ b/tests/auto/gui/painting/qtransform/qtransform.pro
@@ -1,7 +1,6 @@
-load(qttest_p4)
-HEADERS += 
+CONFIG += testcase
+TARGET = tst_qtransform
 SOURCES  += tst_qtransform.cpp
+QT += testlib
 
 unix:!mac:LIBS+=-lm
-
-
diff --git a/tests/auto/gui/painting/qwmatrix/qwmatrix.pro b/tests/auto/gui/painting/qwmatrix/qwmatrix.pro
index 8c6a96794c..a7d79c7d2a 100644
--- a/tests/auto/gui/painting/qwmatrix/qwmatrix.pro
+++ b/tests/auto/gui/painting/qwmatrix/qwmatrix.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qwmatrix
 SOURCES  += tst_qwmatrix.cpp
+QT += testlib
 
 unix:!mac:LIBS+=-lm
-