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>

23 files changed, 67 insertions, 46 deletions

diff --git a/tests/auto/widgets/itemviews/qabstractitemview/qabstractitemview.pro b/tests/auto/widgets/itemviews/qabstractitemview/qabstractitemview.pro
index 7f6c2cb65c..2f0ca73265 100644
--- a/tests/auto/widgets/itemviews/qabstractitemview/qabstractitemview.pro
+++ b/tests/auto/widgets/itemviews/qabstractitemview/qabstractitemview.pro
@@ -1,3 +1,4 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qabstractitemview
+QT += widgets testlib
 SOURCES         += tst_qabstractitemview.cpp
diff --git a/tests/auto/widgets/itemviews/qabstractproxymodel/qabstractproxymodel.pro b/tests/auto/widgets/itemviews/qabstractproxymodel/qabstractproxymodel.pro
index 7a6a841796..5ded15ad5c 100644
--- a/tests/auto/widgets/itemviews/qabstractproxymodel/qabstractproxymodel.pro
+++ b/tests/auto/widgets/itemviews/qabstractproxymodel/qabstractproxymodel.pro
@@ -1,3 +1,4 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qabstractproxymodel
+QT += widgets testlib
 SOURCES  += tst_qabstractproxymodel.cpp
diff --git a/tests/auto/widgets/itemviews/qcolumnview/qcolumnview.pro b/tests/auto/widgets/itemviews/qcolumnview/qcolumnview.pro
index bca9e75ba5..15d904e699 100644
--- a/tests/auto/widgets/itemviews/qcolumnview/qcolumnview.pro
+++ b/tests/auto/widgets/itemviews/qcolumnview/qcolumnview.pro
@@ -1,6 +1,6 @@
-CONFIG += qttest_p4
+CONFIG += testcase
 QT += widgets widgets-private
-QT += gui-private core-private
+QT += gui-private core-private testlib
 
 SOURCES		+= tst_qcolumnview.cpp 
 TARGET		= tst_qcolumnview
diff --git a/tests/auto/widgets/itemviews/qdatawidgetmapper/qdatawidgetmapper.pro b/tests/auto/widgets/itemviews/qdatawidgetmapper/qdatawidgetmapper.pro
index 64e3b57291..53b23b5ef2 100644
--- a/tests/auto/widgets/itemviews/qdatawidgetmapper/qdatawidgetmapper.pro
+++ b/tests/auto/widgets/itemviews/qdatawidgetmapper/qdatawidgetmapper.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qdatawidgetmapper
+QT += widgets testlib
 SOURCES += tst_qdatawidgetmapper.cpp
 
 
diff --git a/tests/auto/widgets/itemviews/qdirmodel/qdirmodel.pro b/tests/auto/widgets/itemviews/qdirmodel/qdirmodel.pro
index bc4e98d6ff..680286d1e4 100644
--- a/tests/auto/widgets/itemviews/qdirmodel/qdirmodel.pro
+++ b/tests/auto/widgets/itemviews/qdirmodel/qdirmodel.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qdirmodel
+QT += widgets testlib
 SOURCES         += tst_qdirmodel.cpp
 
 wince* {
diff --git a/tests/auto/widgets/itemviews/qfileiconprovider/qfileiconprovider.pro b/tests/auto/widgets/itemviews/qfileiconprovider/qfileiconprovider.pro
index 1e3d26de00..37173a175e 100644
--- a/tests/auto/widgets/itemviews/qfileiconprovider/qfileiconprovider.pro
+++ b/tests/auto/widgets/itemviews/qfileiconprovider/qfileiconprovider.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qfileiconprovider
+QT += widgets testlib
 SOURCES  += tst_qfileiconprovider.cpp
 
 
diff --git a/tests/auto/widgets/itemviews/qheaderview/qheaderview.pro b/tests/auto/widgets/itemviews/qheaderview/qheaderview.pro
index 3b3afa7e49..9f400565e9 100644
--- a/tests/auto/widgets/itemviews/qheaderview/qheaderview.pro
+++ b/tests/auto/widgets/itemviews/qheaderview/qheaderview.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qheaderview
 
-QT += widgets widgets-private
+QT += widgets widgets-private testlib
 QT += core-private gui-private
 
 SOURCES  += tst_qheaderview.cpp
diff --git a/tests/auto/widgets/itemviews/qidentityproxymodel/qidentityproxymodel.pro b/tests/auto/widgets/itemviews/qidentityproxymodel/qidentityproxymodel.pro
index 141e72a8c0..52702f3990 100644
--- a/tests/auto/widgets/itemviews/qidentityproxymodel/qidentityproxymodel.pro
+++ b/tests/auto/widgets/itemviews/qidentityproxymodel/qidentityproxymodel.pro
@@ -1,7 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qidentityproxymodel
 
 mtdir = ../../../integrationtests/modeltest
 INCLUDEPATH += $$PWD/$${mtdir}
-QT += widgets
+QT += widgets testlib
 SOURCES         += tst_qidentityproxymodel.cpp $${mtdir}/dynamictreemodel.cpp $${mtdir}/modeltest.cpp
 HEADERS         += $${mtdir}/dynamictreemodel.h $${mtdir}/modeltest.h
diff --git a/tests/auto/widgets/itemviews/qitemdelegate/qitemdelegate.pro b/tests/auto/widgets/itemviews/qitemdelegate/qitemdelegate.pro
index 9a1a3b5e94..17a5d5ea57 100644
--- a/tests/auto/widgets/itemviews/qitemdelegate/qitemdelegate.pro
+++ b/tests/auto/widgets/itemviews/qitemdelegate/qitemdelegate.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qitemdelegate
+QT += widgets testlib
 SOURCES         += tst_qitemdelegate.cpp
 
 win32:!wince*: LIBS += -lUser32
diff --git a/tests/auto/widgets/itemviews/qitemeditorfactory/qitemeditorfactory.pro b/tests/auto/widgets/itemviews/qitemeditorfactory/qitemeditorfactory.pro
index 89bc944c51..5ff7771585 100644
--- a/tests/auto/widgets/itemviews/qitemeditorfactory/qitemeditorfactory.pro
+++ b/tests/auto/widgets/itemviews/qitemeditorfactory/qitemeditorfactory.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qitemeditorfactory
+QT += widgets testlib
 SOURCES  += tst_qitemeditorfactory.cpp
 
 
diff --git a/tests/auto/widgets/itemviews/qitemselectionmodel/qitemselectionmodel.pro b/tests/auto/widgets/itemviews/qitemselectionmodel/qitemselectionmodel.pro
index c675a6eb9d..a4c7ba3786 100644
--- a/tests/auto/widgets/itemviews/qitemselectionmodel/qitemselectionmodel.pro
+++ b/tests/auto/widgets/itemviews/qitemselectionmodel/qitemselectionmodel.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qitemselectionmodel
+QT += widgets testlib
 SOURCES  += tst_qitemselectionmodel.cpp
 
 
diff --git a/tests/auto/widgets/itemviews/qitemview/qitemview.pro b/tests/auto/widgets/itemviews/qitemview/qitemview.pro
index dbdd4612d5..079953d60d 100644
--- a/tests/auto/widgets/itemviews/qitemview/qitemview.pro
+++ b/tests/auto/widgets/itemviews/qitemview/qitemview.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qitemview
+QT += widgets testlib
 SOURCES += tst_qitemview.cpp
 
 
diff --git a/tests/auto/widgets/itemviews/qlistview/qlistview.pro b/tests/auto/widgets/itemviews/qlistview/qlistview.pro
index 07fabbce35..1b76a30e72 100644
--- a/tests/auto/widgets/itemviews/qlistview/qlistview.pro
+++ b/tests/auto/widgets/itemviews/qlistview/qlistview.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets gui-private
+CONFIG += testcase
+TARGET = tst_qlistview
+QT += widgets gui-private testlib
 SOURCES  += tst_qlistview.cpp
 win32:!wince*: LIBS += -luser32
 
diff --git a/tests/auto/widgets/itemviews/qlistwidget/qlistwidget.pro b/tests/auto/widgets/itemviews/qlistwidget/qlistwidget.pro
index 7343415e4c..4a91277220 100644
--- a/tests/auto/widgets/itemviews/qlistwidget/qlistwidget.pro
+++ b/tests/auto/widgets/itemviews/qlistwidget/qlistwidget.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets widgets-private
+CONFIG += testcase
+TARGET = tst_qlistwidget
+QT += widgets widgets-private testlib
 QT += core-private gui-private
 SOURCES  += tst_qlistwidget.cpp
 
diff --git a/tests/auto/widgets/itemviews/qsortfilterproxymodel/qsortfilterproxymodel.pro b/tests/auto/widgets/itemviews/qsortfilterproxymodel/qsortfilterproxymodel.pro
index 65207b6563..4f0d6545ab 100644
--- a/tests/auto/widgets/itemviews/qsortfilterproxymodel/qsortfilterproxymodel.pro
+++ b/tests/auto/widgets/itemviews/qsortfilterproxymodel/qsortfilterproxymodel.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qsortfilterproxymodel
 
-QT += gui widgets
+QT += gui widgets testlib
 mtdir = ../../../integrationtests/modeltest
 
 INCLUDEPATH += $$PWD/$${mtdir}
diff --git a/tests/auto/widgets/itemviews/qstandarditem/qstandarditem.pro b/tests/auto/widgets/itemviews/qstandarditem/qstandarditem.pro
index 1d280fc2f5..9d90f5f125 100644
--- a/tests/auto/widgets/itemviews/qstandarditem/qstandarditem.pro
+++ b/tests/auto/widgets/itemviews/qstandarditem/qstandarditem.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qstandarditem
+QT += widgets testlib
 SOURCES  += tst_qstandarditem.cpp
 
 
diff --git a/tests/auto/widgets/itemviews/qstandarditemmodel/qstandarditemmodel.pro b/tests/auto/widgets/itemviews/qstandarditemmodel/qstandarditemmodel.pro
index 8c634b9630..eef165d9f7 100644
--- a/tests/auto/widgets/itemviews/qstandarditemmodel/qstandarditemmodel.pro
+++ b/tests/auto/widgets/itemviews/qstandarditemmodel/qstandarditemmodel.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qstandarditemmodel
 
-QT += widgets widgets-private
+QT += widgets widgets-private testlib
 QT += core-private gui-private
 
 SOURCES  += tst_qstandarditemmodel.cpp
diff --git a/tests/auto/widgets/itemviews/qstringlistmodel/qstringlistmodel.pro b/tests/auto/widgets/itemviews/qstringlistmodel/qstringlistmodel.pro
index fe70ed7345..ecdd30cae2 100644
--- a/tests/auto/widgets/itemviews/qstringlistmodel/qstringlistmodel.pro
+++ b/tests/auto/widgets/itemviews/qstringlistmodel/qstringlistmodel.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qstringlistmodel
+QT += widgets testlib
 HEADERS += qmodellistener.h
 
 SOURCES         += tst_qstringlistmodel.cpp
diff --git a/tests/auto/widgets/itemviews/qtableview/qtableview.pro b/tests/auto/widgets/itemviews/qtableview/qtableview.pro
index 408119a782..528fa7d014 100644
--- a/tests/auto/widgets/itemviews/qtableview/qtableview.pro
+++ b/tests/auto/widgets/itemviews/qtableview/qtableview.pro
@@ -1,6 +1,6 @@
-load(qttest_p4)
+CONFIG += testcase
 
-QT += widgets widgets-private
+QT += widgets widgets-private testlib
 QT += core-private gui-private
 
 TARGET.EPOCHEAPSIZE = 0x200000 0x800000
diff --git a/tests/auto/widgets/itemviews/qtablewidget/qtablewidget.pro b/tests/auto/widgets/itemviews/qtablewidget/qtablewidget.pro
index eff12c83dc..114ce115eb 100644
--- a/tests/auto/widgets/itemviews/qtablewidget/qtablewidget.pro
+++ b/tests/auto/widgets/itemviews/qtablewidget/qtablewidget.pro
@@ -1,3 +1,4 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qtablewidget
+QT += widgets testlib
 SOURCES  += tst_qtablewidget.cpp
diff --git a/tests/auto/widgets/itemviews/qtreeview/qtreeview.pro b/tests/auto/widgets/itemviews/qtreeview/qtreeview.pro
index ea53bbdc1d..e3955469dc 100644
--- a/tests/auto/widgets/itemviews/qtreeview/qtreeview.pro
+++ b/tests/auto/widgets/itemviews/qtreeview/qtreeview.pro
@@ -1,3 +1,4 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qtreeview
+QT += widgets testlib
 SOURCES  += tst_qtreeview.cpp
diff --git a/tests/auto/widgets/itemviews/qtreewidget/qtreewidget.pro b/tests/auto/widgets/itemviews/qtreewidget/qtreewidget.pro
index 763c0d3c63..3fa0681691 100644
--- a/tests/auto/widgets/itemviews/qtreewidget/qtreewidget.pro
+++ b/tests/auto/widgets/itemviews/qtreewidget/qtreewidget.pro
@@ -1,3 +1,4 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qtreewidget
+QT += widgets testlib
 SOURCES  += tst_qtreewidget.cpp
diff --git a/tests/auto/widgets/itemviews/qtreewidgetitemiterator/qtreewidgetitemiterator.pro b/tests/auto/widgets/itemviews/qtreewidgetitemiterator/qtreewidgetitemiterator.pro
index de7762e773..42a00618a2 100644
--- a/tests/auto/widgets/itemviews/qtreewidgetitemiterator/qtreewidgetitemiterator.pro
+++ b/tests/auto/widgets/itemviews/qtreewidgetitemiterator/qtreewidgetitemiterator.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qtreewidgetitemiterator
+QT += widgets testlib
 SOURCES  += tst_qtreewidgetitemiterator.cpp