From 6b29e881cdd93d8fccec50df9e8d001776800136 Mon Sep 17 00:00:00 2001
From: Rohan McGovern <rohan.mcgovern@nokia.com>
Date: Tue, 25 Oct 2011 14:24:31 +1000
Subject: widgets: 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: I3c1d993d5682db913aadc267d98a638061f393d6
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
---
 tests/auto/widgets/widgets/qabstractbutton/qabstractbutton.pro      | 5 +++--
 .../widgets/widgets/qabstractscrollarea/qabstractscrollarea.pro     | 5 +++--
 tests/auto/widgets/widgets/qabstractslider/qabstractslider.pro      | 5 +++--
 tests/auto/widgets/widgets/qabstractspinbox/qabstractspinbox.pro    | 5 +++--
 tests/auto/widgets/widgets/qbuttongroup/qbuttongroup.pro            | 5 +++--
 tests/auto/widgets/widgets/qcalendarwidget/qcalendarwidget.pro      | 5 +++--
 tests/auto/widgets/widgets/qcheckbox/qcheckbox.pro                  | 5 +++--
 tests/auto/widgets/widgets/qcombobox/qcombobox.pro                  | 5 +++--
 .../auto/widgets/widgets/qcommandlinkbutton/qcommandlinkbutton.pro  | 5 +++--
 tests/auto/widgets/widgets/qdatetimeedit/qdatetimeedit.pro          | 5 +++--
 tests/auto/widgets/widgets/qdial/qdial.pro                          | 5 +++--
 tests/auto/widgets/widgets/qdialogbuttonbox/qdialogbuttonbox.pro    | 4 ++--
 tests/auto/widgets/widgets/qdockwidget/qdockwidget.pro              | 5 +++--
 tests/auto/widgets/widgets/qdoublespinbox/qdoublespinbox.pro        | 5 +++--
 tests/auto/widgets/widgets/qdoublevalidator/qdoublevalidator.pro    | 5 +++--
 tests/auto/widgets/widgets/qfocusframe/qfocusframe.pro              | 5 +++--
 tests/auto/widgets/widgets/qfontcombobox/qfontcombobox.pro          | 5 +++--
 tests/auto/widgets/widgets/qgroupbox/qgroupbox.pro                  | 5 +++--
 tests/auto/widgets/widgets/qintvalidator/qintvalidator.pro          | 6 +++---
 tests/auto/widgets/widgets/qlabel/qlabel.pro                        | 5 +++--
 tests/auto/widgets/widgets/qlcdnumber/qlcdnumber.pro                | 5 +++--
 tests/auto/widgets/widgets/qlineedit/qlineedit.pro                  | 5 +++--
 tests/auto/widgets/widgets/qmainwindow/qmainwindow.pro              | 5 +++--
 tests/auto/widgets/widgets/qmdiarea/qmdiarea.pro                    | 5 +++--
 tests/auto/widgets/widgets/qmdisubwindow/qmdisubwindow.pro          | 5 +++--
 tests/auto/widgets/widgets/qmenu/qmenu.pro                          | 5 +++--
 tests/auto/widgets/widgets/qmenubar/qmenubar.pro                    | 5 +++--
 tests/auto/widgets/widgets/qplaintextedit/qplaintextedit.pro        | 5 +++--
 tests/auto/widgets/widgets/qprogressbar/qprogressbar.pro            | 5 +++--
 tests/auto/widgets/widgets/qpushbutton/qpushbutton.pro              | 5 +++--
 tests/auto/widgets/widgets/qradiobutton/qradiobutton.pro            | 5 +++--
 tests/auto/widgets/widgets/qregexpvalidator/qregexpvalidator.pro    | 6 +++---
 tests/auto/widgets/widgets/qscrollarea/qscrollarea.pro              | 5 +++--
 tests/auto/widgets/widgets/qscrollbar/qscrollbar.pro                | 5 +++--
 tests/auto/widgets/widgets/qsizegrip/qsizegrip.pro                  | 5 +++--
 tests/auto/widgets/widgets/qslider/qslider.pro                      | 5 +++--
 tests/auto/widgets/widgets/qspinbox/qspinbox.pro                    | 5 +++--
 tests/auto/widgets/widgets/qsplitter/qsplitter.pro                  | 5 +++--
 tests/auto/widgets/widgets/qstackedwidget/qstackedwidget.pro        | 5 +++--
 tests/auto/widgets/widgets/qstatusbar/qstatusbar.pro                | 5 +++--
 tests/auto/widgets/widgets/qtabbar/qtabbar.pro                      | 5 +++--
 tests/auto/widgets/widgets/qtabwidget/qtabwidget.pro                | 5 +++--
 tests/auto/widgets/widgets/qtextbrowser/qtextbrowser.pro            | 5 +++--
 tests/auto/widgets/widgets/qtextedit/qtextedit.pro                  | 5 +++--
 tests/auto/widgets/widgets/qtoolbar/qtoolbar.pro                    | 5 +++--
 tests/auto/widgets/widgets/qtoolbox/qtoolbox.pro                    | 5 +++--
 tests/auto/widgets/widgets/qtoolbutton/qtoolbutton.pro              | 5 +++--
 tests/auto/widgets/widgets/qworkspace/qworkspace.pro                | 5 +++--
 48 files changed, 143 insertions(+), 98 deletions(-)

(limited to 'tests/auto/widgets/widgets')

diff --git a/tests/auto/widgets/widgets/qabstractbutton/qabstractbutton.pro b/tests/auto/widgets/widgets/qabstractbutton/qabstractbutton.pro
index 15d90ed4e1..2f0111f483 100644
--- a/tests/auto/widgets/widgets/qabstractbutton/qabstractbutton.pro
+++ b/tests/auto/widgets/widgets/qabstractbutton/qabstractbutton.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qabstractbutton
+QT += widgets testlib
 SOURCES  += tst_qabstractbutton.cpp
 
 
diff --git a/tests/auto/widgets/widgets/qabstractscrollarea/qabstractscrollarea.pro b/tests/auto/widgets/widgets/qabstractscrollarea/qabstractscrollarea.pro
index e4bc3f6495..2d9aa52e3a 100644
--- a/tests/auto/widgets/widgets/qabstractscrollarea/qabstractscrollarea.pro
+++ b/tests/auto/widgets/widgets/qabstractscrollarea/qabstractscrollarea.pro
@@ -2,8 +2,9 @@
 # Project file for autotest for file qabstractscrollarea.h
 ############################################################
 
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qabstractscrollarea
+QT += widgets testlib
 SOURCES += tst_qabstractscrollarea.cpp
 
 
diff --git a/tests/auto/widgets/widgets/qabstractslider/qabstractslider.pro b/tests/auto/widgets/widgets/qabstractslider/qabstractslider.pro
index 4507859ace..6453999786 100644
--- a/tests/auto/widgets/widgets/qabstractslider/qabstractslider.pro
+++ b/tests/auto/widgets/widgets/qabstractslider/qabstractslider.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qabstractslider
+QT += widgets testlib
 SOURCES  += tst_qabstractslider.cpp
 
 
diff --git a/tests/auto/widgets/widgets/qabstractspinbox/qabstractspinbox.pro b/tests/auto/widgets/widgets/qabstractspinbox/qabstractspinbox.pro
index e156b2493d..f9b601228e 100644
--- a/tests/auto/widgets/widgets/qabstractspinbox/qabstractspinbox.pro
+++ b/tests/auto/widgets/widgets/qabstractspinbox/qabstractspinbox.pro
@@ -2,8 +2,9 @@
 # Project file for autotest for file qabstractspinbox.h
 ############################################################
 
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qabstractspinbox
+QT += widgets testlib
 SOURCES += tst_qabstractspinbox.cpp
 
 
diff --git a/tests/auto/widgets/widgets/qbuttongroup/qbuttongroup.pro b/tests/auto/widgets/widgets/qbuttongroup/qbuttongroup.pro
index 6f506e8f06..36049cdf0d 100644
--- a/tests/auto/widgets/widgets/qbuttongroup/qbuttongroup.pro
+++ b/tests/auto/widgets/widgets/qbuttongroup/qbuttongroup.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qbuttongroup
+QT += widgets testlib
 SOURCES  += tst_qbuttongroup.cpp
 
 
diff --git a/tests/auto/widgets/widgets/qcalendarwidget/qcalendarwidget.pro b/tests/auto/widgets/widgets/qcalendarwidget/qcalendarwidget.pro
index d250b83537..d30685e652 100644
--- a/tests/auto/widgets/widgets/qcalendarwidget/qcalendarwidget.pro
+++ b/tests/auto/widgets/widgets/qcalendarwidget/qcalendarwidget.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qcalendarwidget
+QT += widgets testlib
 SOURCES  += tst_qcalendarwidget.cpp
 
 
diff --git a/tests/auto/widgets/widgets/qcheckbox/qcheckbox.pro b/tests/auto/widgets/widgets/qcheckbox/qcheckbox.pro
index aa1f35b3c9..4282b25c9f 100644
--- a/tests/auto/widgets/widgets/qcheckbox/qcheckbox.pro
+++ b/tests/auto/widgets/widgets/qcheckbox/qcheckbox.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qcheckbox
+QT += widgets testlib
 SOURCES  += tst_qcheckbox.cpp
 
 
diff --git a/tests/auto/widgets/widgets/qcombobox/qcombobox.pro b/tests/auto/widgets/widgets/qcombobox/qcombobox.pro
index 7f5b57c237..88b9d08557 100644
--- a/tests/auto/widgets/widgets/qcombobox/qcombobox.pro
+++ b/tests/auto/widgets/widgets/qcombobox/qcombobox.pro
@@ -1,3 +1,4 @@
-load(qttest_p4)
-QT += widgets widgets-private gui-private core-private
+CONFIG += testcase
+TARGET = tst_qcombobox
+QT += widgets widgets-private gui-private core-private testlib
 SOURCES  += tst_qcombobox.cpp
diff --git a/tests/auto/widgets/widgets/qcommandlinkbutton/qcommandlinkbutton.pro b/tests/auto/widgets/widgets/qcommandlinkbutton/qcommandlinkbutton.pro
index 497b8298a2..be3cfcd104 100644
--- a/tests/auto/widgets/widgets/qcommandlinkbutton/qcommandlinkbutton.pro
+++ b/tests/auto/widgets/widgets/qcommandlinkbutton/qcommandlinkbutton.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qcommandlinkbutton
+QT += widgets testlib
 SOURCES  += tst_qcommandlinkbutton.cpp
 
 
diff --git a/tests/auto/widgets/widgets/qdatetimeedit/qdatetimeedit.pro b/tests/auto/widgets/widgets/qdatetimeedit/qdatetimeedit.pro
index 47356d448c..fd579a14cd 100644
--- a/tests/auto/widgets/widgets/qdatetimeedit/qdatetimeedit.pro
+++ b/tests/auto/widgets/widgets/qdatetimeedit/qdatetimeedit.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qdatetimeedit
+QT += widgets testlib
 SOURCES  += tst_qdatetimeedit.cpp
 
 wincewm50smart-msvc2005: DEFINES += WINCE_NO_MODIFIER_KEYS
diff --git a/tests/auto/widgets/widgets/qdial/qdial.pro b/tests/auto/widgets/widgets/qdial/qdial.pro
index acf66de430..9bdd61f9d5 100644
--- a/tests/auto/widgets/widgets/qdial/qdial.pro
+++ b/tests/auto/widgets/widgets/qdial/qdial.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qdial
+QT += widgets testlib
 SOURCES  += tst_qdial.cpp
 
 
diff --git a/tests/auto/widgets/widgets/qdialogbuttonbox/qdialogbuttonbox.pro b/tests/auto/widgets/widgets/qdialogbuttonbox/qdialogbuttonbox.pro
index efbeca0c1b..7f2ad59581 100644
--- a/tests/auto/widgets/widgets/qdialogbuttonbox/qdialogbuttonbox.pro
+++ b/tests/auto/widgets/widgets/qdialogbuttonbox/qdialogbuttonbox.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+QT += widgets testlib
 SOURCES += tst_qdialogbuttonbox.cpp
 
 TARGET = tst_qdialogbuttonbox
diff --git a/tests/auto/widgets/widgets/qdockwidget/qdockwidget.pro b/tests/auto/widgets/widgets/qdockwidget/qdockwidget.pro
index e59728207f..b55edb0674 100644
--- a/tests/auto/widgets/widgets/qdockwidget/qdockwidget.pro
+++ b/tests/auto/widgets/widgets/qdockwidget/qdockwidget.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets widgets-private
+CONFIG += testcase
+TARGET = tst_qdockwidget
+QT += widgets widgets-private testlib
 QT += core-private gui-private
 
 SOURCES += tst_qdockwidget.cpp
diff --git a/tests/auto/widgets/widgets/qdoublespinbox/qdoublespinbox.pro b/tests/auto/widgets/widgets/qdoublespinbox/qdoublespinbox.pro
index ff0eb2edae..5a3b0360e1 100644
--- a/tests/auto/widgets/widgets/qdoublespinbox/qdoublespinbox.pro
+++ b/tests/auto/widgets/widgets/qdoublespinbox/qdoublespinbox.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qdoublespinbox
+QT += widgets testlib
 SOURCES  += tst_qdoublespinbox.cpp
 
 CONFIG += insignificant_test # QTBUG-21402
diff --git a/tests/auto/widgets/widgets/qdoublevalidator/qdoublevalidator.pro b/tests/auto/widgets/widgets/qdoublevalidator/qdoublevalidator.pro
index 7fbb72bb7f..ab7ee03db0 100644
--- a/tests/auto/widgets/widgets/qdoublevalidator/qdoublevalidator.pro
+++ b/tests/auto/widgets/widgets/qdoublevalidator/qdoublevalidator.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qdoublevalidator
+QT += widgets testlib
 SOURCES += tst_qdoublevalidator.cpp
 
 
diff --git a/tests/auto/widgets/widgets/qfocusframe/qfocusframe.pro b/tests/auto/widgets/widgets/qfocusframe/qfocusframe.pro
index 0fcc9bf23d..404edcd075 100644
--- a/tests/auto/widgets/widgets/qfocusframe/qfocusframe.pro
+++ b/tests/auto/widgets/widgets/qfocusframe/qfocusframe.pro
@@ -2,8 +2,9 @@
 # Project file for autotest for file qfocusframe.h
 ############################################################
 
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qfocusframe
+QT += widgets testlib
 SOURCES += tst_qfocusframe.cpp
 
 
diff --git a/tests/auto/widgets/widgets/qfontcombobox/qfontcombobox.pro b/tests/auto/widgets/widgets/qfontcombobox/qfontcombobox.pro
index 7faa0e36bd..942c6b4e46 100644
--- a/tests/auto/widgets/widgets/qfontcombobox/qfontcombobox.pro
+++ b/tests/auto/widgets/widgets/qfontcombobox/qfontcombobox.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qfontcombobox
+QT += widgets testlib
 SOURCES  += tst_qfontcombobox.cpp
 
 CONFIG += insignificant_test # QTBUG-21402
diff --git a/tests/auto/widgets/widgets/qgroupbox/qgroupbox.pro b/tests/auto/widgets/widgets/qgroupbox/qgroupbox.pro
index f4181a33ed..4a5e76ff65 100644
--- a/tests/auto/widgets/widgets/qgroupbox/qgroupbox.pro
+++ b/tests/auto/widgets/widgets/qgroupbox/qgroupbox.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qgroupbox
+QT += widgets testlib
 SOURCES  += tst_qgroupbox.cpp
 
 
diff --git a/tests/auto/widgets/widgets/qintvalidator/qintvalidator.pro b/tests/auto/widgets/widgets/qintvalidator/qintvalidator.pro
index 576621a08b..52e0b85735 100644
--- a/tests/auto/widgets/widgets/qintvalidator/qintvalidator.pro
+++ b/tests/auto/widgets/widgets/qintvalidator/qintvalidator.pro
@@ -1,4 +1,4 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qintvalidator
 SOURCES += tst_qintvalidator.cpp
-
-
+QT += testlib
diff --git a/tests/auto/widgets/widgets/qlabel/qlabel.pro b/tests/auto/widgets/widgets/qlabel/qlabel.pro
index 0e0c3a43c4..3aacb60224 100644
--- a/tests/auto/widgets/widgets/qlabel/qlabel.pro
+++ b/tests/auto/widgets/widgets/qlabel/qlabel.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qlabel
 
-QT += widgets widgets-private
+QT += widgets widgets-private testlib
 QT += core-private gui-private
 
 SOURCES += tst_qlabel.cpp
diff --git a/tests/auto/widgets/widgets/qlcdnumber/qlcdnumber.pro b/tests/auto/widgets/widgets/qlcdnumber/qlcdnumber.pro
index cd909de5be..1508806fb0 100644
--- a/tests/auto/widgets/widgets/qlcdnumber/qlcdnumber.pro
+++ b/tests/auto/widgets/widgets/qlcdnumber/qlcdnumber.pro
@@ -2,8 +2,9 @@
 # Project file for autotest for file qlcdnumber.h
 ############################################################
 
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qlcdnumber
+QT += widgets testlib
 SOURCES += tst_qlcdnumber.cpp
 
 
diff --git a/tests/auto/widgets/widgets/qlineedit/qlineedit.pro b/tests/auto/widgets/widgets/qlineedit/qlineedit.pro
index 077b7c919e..77b2ae537c 100644
--- a/tests/auto/widgets/widgets/qlineedit/qlineedit.pro
+++ b/tests/auto/widgets/widgets/qlineedit/qlineedit.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qlineedit
+QT += widgets testlib
 SOURCES  += tst_qlineedit.cpp
 
 CONFIG += insignificant_test # QTBUG-21402
diff --git a/tests/auto/widgets/widgets/qmainwindow/qmainwindow.pro b/tests/auto/widgets/widgets/qmainwindow/qmainwindow.pro
index c140f76c89..7e0a5320b0 100644
--- a/tests/auto/widgets/widgets/qmainwindow/qmainwindow.pro
+++ b/tests/auto/widgets/widgets/qmainwindow/qmainwindow.pro
@@ -1,3 +1,4 @@
-load(qttest_p4)
-QT += widgets widgets-private
+CONFIG += testcase
+TARGET = tst_qmainwindow
+QT += widgets widgets-private testlib
 SOURCES += tst_qmainwindow.cpp
diff --git a/tests/auto/widgets/widgets/qmdiarea/qmdiarea.pro b/tests/auto/widgets/widgets/qmdiarea/qmdiarea.pro
index 6a12152fcc..54aa3c4ff1 100644
--- a/tests/auto/widgets/widgets/qmdiarea/qmdiarea.pro
+++ b/tests/auto/widgets/widgets/qmdiarea/qmdiarea.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qmdiarea
 
-QT += gui-private widgets
+QT += gui-private widgets testlib
 
 INCLUDEPATH += .
 SOURCES += tst_qmdiarea.cpp
diff --git a/tests/auto/widgets/widgets/qmdisubwindow/qmdisubwindow.pro b/tests/auto/widgets/widgets/qmdisubwindow/qmdisubwindow.pro
index 5c5bd525df..be929d1429 100644
--- a/tests/auto/widgets/widgets/qmdisubwindow/qmdisubwindow.pro
+++ b/tests/auto/widgets/widgets/qmdisubwindow/qmdisubwindow.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qmdisubwindow
+QT += widgets testlib
 INCLUDEPATH += .
 SOURCES  += tst_qmdisubwindow.cpp
 DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
diff --git a/tests/auto/widgets/widgets/qmenu/qmenu.pro b/tests/auto/widgets/widgets/qmenu/qmenu.pro
index 1fc1a7ff9d..f426a0cfaa 100644
--- a/tests/auto/widgets/widgets/qmenu/qmenu.pro
+++ b/tests/auto/widgets/widgets/qmenu/qmenu.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qmenu
+QT += widgets testlib
 SOURCES  += tst_qmenu.cpp
 
 qpa:contains(QT_CONFIG,xcb):CONFIG+=insignificant_test  # QTBUG-21100, unstably fails
diff --git a/tests/auto/widgets/widgets/qmenubar/qmenubar.pro b/tests/auto/widgets/widgets/qmenubar/qmenubar.pro
index 73c2545710..3fb6ae61a8 100644
--- a/tests/auto/widgets/widgets/qmenubar/qmenubar.pro
+++ b/tests/auto/widgets/widgets/qmenubar/qmenubar.pro
@@ -1,3 +1,4 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qmenubar
+QT += widgets testlib
 SOURCES += tst_qmenubar.cpp
diff --git a/tests/auto/widgets/widgets/qplaintextedit/qplaintextedit.pro b/tests/auto/widgets/widgets/qplaintextedit/qplaintextedit.pro
index feac5e3f43..e98bae2089 100644
--- a/tests/auto/widgets/widgets/qplaintextedit/qplaintextedit.pro
+++ b/tests/auto/widgets/widgets/qplaintextedit/qplaintextedit.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qplaintextedit
 
-QT += widgets widgets-private
+QT += widgets widgets-private testlib
 QT += gui-private
 
 INCLUDEPATH += ../
diff --git a/tests/auto/widgets/widgets/qprogressbar/qprogressbar.pro b/tests/auto/widgets/widgets/qprogressbar/qprogressbar.pro
index 70d8c9111f..1de3e6309f 100644
--- a/tests/auto/widgets/widgets/qprogressbar/qprogressbar.pro
+++ b/tests/auto/widgets/widgets/qprogressbar/qprogressbar.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qprogressbar
+QT += widgets testlib
 SOURCES += tst_qprogressbar.cpp
 
 
diff --git a/tests/auto/widgets/widgets/qpushbutton/qpushbutton.pro b/tests/auto/widgets/widgets/qpushbutton/qpushbutton.pro
index e2fd455951..353ad06ca2 100644
--- a/tests/auto/widgets/widgets/qpushbutton/qpushbutton.pro
+++ b/tests/auto/widgets/widgets/qpushbutton/qpushbutton.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qpushbutton
+QT += widgets testlib
 SOURCES  += tst_qpushbutton.cpp
 
 
diff --git a/tests/auto/widgets/widgets/qradiobutton/qradiobutton.pro b/tests/auto/widgets/widgets/qradiobutton/qradiobutton.pro
index 82b2ff20a8..a89733e9e1 100644
--- a/tests/auto/widgets/widgets/qradiobutton/qradiobutton.pro
+++ b/tests/auto/widgets/widgets/qradiobutton/qradiobutton.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qradiobutton
+QT += widgets testlib
 SOURCES  += tst_qradiobutton.cpp
 
 
diff --git a/tests/auto/widgets/widgets/qregexpvalidator/qregexpvalidator.pro b/tests/auto/widgets/widgets/qregexpvalidator/qregexpvalidator.pro
index 68e5c51677..8f1de5b747 100644
--- a/tests/auto/widgets/widgets/qregexpvalidator/qregexpvalidator.pro
+++ b/tests/auto/widgets/widgets/qregexpvalidator/qregexpvalidator.pro
@@ -1,4 +1,4 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qregexpvalidator
 SOURCES += tst_qregexpvalidator.cpp
-
-
+QT += testlib
diff --git a/tests/auto/widgets/widgets/qscrollarea/qscrollarea.pro b/tests/auto/widgets/widgets/qscrollarea/qscrollarea.pro
index 5b2602bbdb..bdf18a0252 100644
--- a/tests/auto/widgets/widgets/qscrollarea/qscrollarea.pro
+++ b/tests/auto/widgets/widgets/qscrollarea/qscrollarea.pro
@@ -2,8 +2,9 @@
 # Project file for autotest for file qscrollarea.h
 ############################################################
 
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qscrollarea
+QT += widgets testlib
 SOURCES += tst_qscrollarea.cpp
 
 
diff --git a/tests/auto/widgets/widgets/qscrollbar/qscrollbar.pro b/tests/auto/widgets/widgets/qscrollbar/qscrollbar.pro
index 262855452f..36e7e0993a 100644
--- a/tests/auto/widgets/widgets/qscrollbar/qscrollbar.pro
+++ b/tests/auto/widgets/widgets/qscrollbar/qscrollbar.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qscrollbar
+QT += widgets testlib
 SOURCES += tst_qscrollbar.cpp
 
 mac*:CONFIG+=insignificant_test
diff --git a/tests/auto/widgets/widgets/qsizegrip/qsizegrip.pro b/tests/auto/widgets/widgets/qsizegrip/qsizegrip.pro
index da6dd5af49..995fb15af4 100644
--- a/tests/auto/widgets/widgets/qsizegrip/qsizegrip.pro
+++ b/tests/auto/widgets/widgets/qsizegrip/qsizegrip.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qsizegrip
 INCLUDEPATH += .
-QT += widgets
+QT += widgets testlib
 SOURCES += tst_qsizegrip.cpp
 
 
diff --git a/tests/auto/widgets/widgets/qslider/qslider.pro b/tests/auto/widgets/widgets/qslider/qslider.pro
index 41f011649d..4c8b061459 100644
--- a/tests/auto/widgets/widgets/qslider/qslider.pro
+++ b/tests/auto/widgets/widgets/qslider/qslider.pro
@@ -2,8 +2,9 @@
 # Project file for autotest for file qslider.h
 ############################################################
 
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qslider
+QT += widgets testlib
 SOURCES += tst_qslider.cpp
 
 
diff --git a/tests/auto/widgets/widgets/qspinbox/qspinbox.pro b/tests/auto/widgets/widgets/qspinbox/qspinbox.pro
index c88dc0ee8f..0541eaadeb 100644
--- a/tests/auto/widgets/widgets/qspinbox/qspinbox.pro
+++ b/tests/auto/widgets/widgets/qspinbox/qspinbox.pro
@@ -1,3 +1,4 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qspinbox
+QT += widgets testlib
 SOURCES  += tst_qspinbox.cpp
diff --git a/tests/auto/widgets/widgets/qsplitter/qsplitter.pro b/tests/auto/widgets/widgets/qsplitter/qsplitter.pro
index 9942c899ca..79015269ef 100644
--- a/tests/auto/widgets/widgets/qsplitter/qsplitter.pro
+++ b/tests/auto/widgets/widgets/qsplitter/qsplitter.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qsplitter
+QT += widgets testlib
 SOURCES  += tst_qsplitter.cpp
 
 wince* {
diff --git a/tests/auto/widgets/widgets/qstackedwidget/qstackedwidget.pro b/tests/auto/widgets/widgets/qstackedwidget/qstackedwidget.pro
index c9436c6a86..2e8b86f35a 100644
--- a/tests/auto/widgets/widgets/qstackedwidget/qstackedwidget.pro
+++ b/tests/auto/widgets/widgets/qstackedwidget/qstackedwidget.pro
@@ -2,8 +2,9 @@
 # Project file for autotest for file qstackedwidget.h
 ############################################################
 
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qstackedwidget
+QT += widgets testlib
 SOURCES += tst_qstackedwidget.cpp
 
 
diff --git a/tests/auto/widgets/widgets/qstatusbar/qstatusbar.pro b/tests/auto/widgets/widgets/qstatusbar/qstatusbar.pro
index 51ec0e9cdb..5cf40f7b36 100644
--- a/tests/auto/widgets/widgets/qstatusbar/qstatusbar.pro
+++ b/tests/auto/widgets/widgets/qstatusbar/qstatusbar.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qstatusbar
+QT += widgets testlib
 SOURCES  += tst_qstatusbar.cpp
 
 
diff --git a/tests/auto/widgets/widgets/qtabbar/qtabbar.pro b/tests/auto/widgets/widgets/qtabbar/qtabbar.pro
index befe5704ba..01b3c4a404 100644
--- a/tests/auto/widgets/widgets/qtabbar/qtabbar.pro
+++ b/tests/auto/widgets/widgets/qtabbar/qtabbar.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qtabbar
+QT += widgets testlib
 SOURCES  += tst_qtabbar.cpp
 
 
diff --git a/tests/auto/widgets/widgets/qtabwidget/qtabwidget.pro b/tests/auto/widgets/widgets/qtabwidget/qtabwidget.pro
index d551c66500..bbc6e3c205 100644
--- a/tests/auto/widgets/widgets/qtabwidget/qtabwidget.pro
+++ b/tests/auto/widgets/widgets/qtabwidget/qtabwidget.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qtabwidget
 
-QT += widgets widgets-private
+QT += widgets widgets-private testlib
 
 INCLUDEPATH += ../
 
diff --git a/tests/auto/widgets/widgets/qtextbrowser/qtextbrowser.pro b/tests/auto/widgets/widgets/qtextbrowser/qtextbrowser.pro
index ae5177686b..d66adf7fad 100644
--- a/tests/auto/widgets/widgets/qtextbrowser/qtextbrowser.pro
+++ b/tests/auto/widgets/widgets/qtextbrowser/qtextbrowser.pro
@@ -1,8 +1,9 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qtextbrowser
 SOURCES += tst_qtextbrowser.cpp
 DEFINES += SRCDIR=\\\"$$PWD\\\"
 
-QT += widgets
+QT += widgets testlib
 
 wince* {
    addFiles.files = *.html
diff --git a/tests/auto/widgets/widgets/qtextedit/qtextedit.pro b/tests/auto/widgets/widgets/qtextedit/qtextedit.pro
index f29a2d2850..c89af425d5 100644
--- a/tests/auto/widgets/widgets/qtextedit/qtextedit.pro
+++ b/tests/auto/widgets/widgets/qtextedit/qtextedit.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qtextedit
 
-QT += widgets widgets-private gui-private
+QT += widgets widgets-private gui-private testlib
 INCLUDEPATH += ../
 
 HEADERS +=  
diff --git a/tests/auto/widgets/widgets/qtoolbar/qtoolbar.pro b/tests/auto/widgets/widgets/qtoolbar/qtoolbar.pro
index b340097d81..ef1a0e0ba0 100644
--- a/tests/auto/widgets/widgets/qtoolbar/qtoolbar.pro
+++ b/tests/auto/widgets/widgets/qtoolbar/qtoolbar.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets widgets-private
+CONFIG += testcase
+TARGET = tst_qtoolbar
+QT += widgets widgets-private testlib
 QT += gui-private
 SOURCES += tst_qtoolbar.cpp
 
diff --git a/tests/auto/widgets/widgets/qtoolbox/qtoolbox.pro b/tests/auto/widgets/widgets/qtoolbox/qtoolbox.pro
index 24f3ea6cb9..19b3a03443 100644
--- a/tests/auto/widgets/widgets/qtoolbox/qtoolbox.pro
+++ b/tests/auto/widgets/widgets/qtoolbox/qtoolbox.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qtoolbox
+QT += widgets testlib
 SOURCES  += tst_qtoolbox.cpp
 
 
diff --git a/tests/auto/widgets/widgets/qtoolbutton/qtoolbutton.pro b/tests/auto/widgets/widgets/qtoolbutton/qtoolbutton.pro
index 5f082682ad..441477e956 100644
--- a/tests/auto/widgets/widgets/qtoolbutton/qtoolbutton.pro
+++ b/tests/auto/widgets/widgets/qtoolbutton/qtoolbutton.pro
@@ -1,3 +1,4 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qtoolbutton
+QT += widgets testlib
 SOURCES += tst_qtoolbutton.cpp
diff --git a/tests/auto/widgets/widgets/qworkspace/qworkspace.pro b/tests/auto/widgets/widgets/qworkspace/qworkspace.pro
index 0b8a604fe8..02de0031fd 100644
--- a/tests/auto/widgets/widgets/qworkspace/qworkspace.pro
+++ b/tests/auto/widgets/widgets/qworkspace/qworkspace.pro
@@ -1,3 +1,4 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qworkspace
+QT += widgets testlib
 SOURCES  += tst_qworkspace.cpp
-- 
cgit v1.2.3