From 6b29e881cdd93d8fccec50df9e8d001776800136 Mon Sep 17 00:00:00 2001 From: Rohan McGovern 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 --- tests/auto/widgets/kernel/qaction/qaction.pro | 5 +++-- tests/auto/widgets/kernel/qactiongroup/qactiongroup.pro | 5 +++-- tests/auto/widgets/kernel/qapplication/test/test.pro | 4 ++-- tests/auto/widgets/kernel/qboxlayout/qboxlayout.pro | 5 +++-- tests/auto/widgets/kernel/qdesktopwidget/qdesktopwidget.pro | 5 +++-- tests/auto/widgets/kernel/qformlayout/qformlayout.pro | 5 +++-- tests/auto/widgets/kernel/qgridlayout/qgridlayout.pro | 5 +++-- tests/auto/widgets/kernel/qinputcontext/qinputcontext.pro | 5 +++-- tests/auto/widgets/kernel/qlayout/qlayout.pro | 5 +++-- tests/auto/widgets/kernel/qsound/qsound.pro | 4 +++- tests/auto/widgets/kernel/qstackedlayout/qstackedlayout.pro | 5 +++-- tests/auto/widgets/kernel/qtooltip/qtooltip.pro | 5 +++-- tests/auto/widgets/kernel/qwidget/qwidget.pro | 5 +++-- tests/auto/widgets/kernel/qwidget_window/qwidget_window.pro | 5 +++-- tests/auto/widgets/kernel/qwidgetaction/qwidgetaction.pro | 5 +++-- 15 files changed, 44 insertions(+), 29 deletions(-) (limited to 'tests/auto/widgets/kernel') diff --git a/tests/auto/widgets/kernel/qaction/qaction.pro b/tests/auto/widgets/kernel/qaction/qaction.pro index 9c3648d52f..e6f0735394 100644 --- a/tests/auto/widgets/kernel/qaction/qaction.pro +++ b/tests/auto/widgets/kernel/qaction/qaction.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += widgets +CONFIG += testcase +TARGET = tst_qaction +QT += widgets testlib SOURCES += tst_qaction.cpp diff --git a/tests/auto/widgets/kernel/qactiongroup/qactiongroup.pro b/tests/auto/widgets/kernel/qactiongroup/qactiongroup.pro index 9b8636968b..87521edfe9 100644 --- a/tests/auto/widgets/kernel/qactiongroup/qactiongroup.pro +++ b/tests/auto/widgets/kernel/qactiongroup/qactiongroup.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += widgets +CONFIG += testcase +TARGET = tst_qactiongroup +QT += widgets testlib SOURCES += tst_qactiongroup.cpp diff --git a/tests/auto/widgets/kernel/qapplication/test/test.pro b/tests/auto/widgets/kernel/qapplication/test/test.pro index 65aae7b0b9..1118f7fc1a 100644 --- a/tests/auto/widgets/kernel/qapplication/test/test.pro +++ b/tests/auto/widgets/kernel/qapplication/test/test.pro @@ -1,6 +1,6 @@ -load(qttest_p4) +CONFIG += testcase -QT += widgets widgets-private +QT += widgets widgets-private testlib QT += core-private gui-private SOURCES += ../tst_qapplication.cpp diff --git a/tests/auto/widgets/kernel/qboxlayout/qboxlayout.pro b/tests/auto/widgets/kernel/qboxlayout/qboxlayout.pro index c37f12f74f..90e83f5285 100644 --- a/tests/auto/widgets/kernel/qboxlayout/qboxlayout.pro +++ b/tests/auto/widgets/kernel/qboxlayout/qboxlayout.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += widgets +CONFIG += testcase +TARGET = tst_qboxlayout +QT += widgets testlib SOURCES += tst_qboxlayout.cpp diff --git a/tests/auto/widgets/kernel/qdesktopwidget/qdesktopwidget.pro b/tests/auto/widgets/kernel/qdesktopwidget/qdesktopwidget.pro index 730b273c4f..1ab155f22e 100644 --- a/tests/auto/widgets/kernel/qdesktopwidget/qdesktopwidget.pro +++ b/tests/auto/widgets/kernel/qdesktopwidget/qdesktopwidget.pro @@ -1,3 +1,4 @@ -load(qttest_p4) -QT += widgets +CONFIG += testcase +TARGET = tst_qdesktopwidget +QT += widgets testlib SOURCES += tst_qdesktopwidget.cpp diff --git a/tests/auto/widgets/kernel/qformlayout/qformlayout.pro b/tests/auto/widgets/kernel/qformlayout/qformlayout.pro index 24c452af9f..be944605a3 100644 --- a/tests/auto/widgets/kernel/qformlayout/qformlayout.pro +++ b/tests/auto/widgets/kernel/qformlayout/qformlayout.pro @@ -1,3 +1,4 @@ -load(qttest_p4) -QT += widgets +CONFIG += testcase +TARGET = tst_qformlayout +QT += widgets testlib SOURCES += tst_qformlayout.cpp diff --git a/tests/auto/widgets/kernel/qgridlayout/qgridlayout.pro b/tests/auto/widgets/kernel/qgridlayout/qgridlayout.pro index 6bd42fe432..ee64f8538f 100644 --- a/tests/auto/widgets/kernel/qgridlayout/qgridlayout.pro +++ b/tests/auto/widgets/kernel/qgridlayout/qgridlayout.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qgridlayout -QT += widgets widgets-private +QT += widgets widgets-private testlib QT += core-private gui-private SOURCES += tst_qgridlayout.cpp diff --git a/tests/auto/widgets/kernel/qinputcontext/qinputcontext.pro b/tests/auto/widgets/kernel/qinputcontext/qinputcontext.pro index cdadb0c5ed..3700cadf8b 100644 --- a/tests/auto/widgets/kernel/qinputcontext/qinputcontext.pro +++ b/tests/auto/widgets/kernel/qinputcontext/qinputcontext.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += widgets +CONFIG += testcase +TARGET = tst_qinputcontext +QT += widgets testlib SOURCES += tst_qinputcontext.cpp mac*:CONFIG+=insignificant_test diff --git a/tests/auto/widgets/kernel/qlayout/qlayout.pro b/tests/auto/widgets/kernel/qlayout/qlayout.pro index 28ca9dc86d..c85879d89c 100644 --- a/tests/auto/widgets/kernel/qlayout/qlayout.pro +++ b/tests/auto/widgets/kernel/qlayout/qlayout.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qlayout -QT += widgets widgets-private +QT += widgets widgets-private testlib SOURCES += tst_qlayout.cpp wince* { diff --git a/tests/auto/widgets/kernel/qsound/qsound.pro b/tests/auto/widgets/kernel/qsound/qsound.pro index 18ebaf16a4..4142afc88c 100644 --- a/tests/auto/widgets/kernel/qsound/qsound.pro +++ b/tests/auto/widgets/kernel/qsound/qsound.pro @@ -1,5 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qsound SOURCES += tst_qsound.cpp +QT += testlib wince* { deploy.files += 4.wav diff --git a/tests/auto/widgets/kernel/qstackedlayout/qstackedlayout.pro b/tests/auto/widgets/kernel/qstackedlayout/qstackedlayout.pro index 30f074d9b1..1f94c1b386 100644 --- a/tests/auto/widgets/kernel/qstackedlayout/qstackedlayout.pro +++ b/tests/auto/widgets/kernel/qstackedlayout/qstackedlayout.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += widgets +CONFIG += testcase +TARGET = tst_qstackedlayout +QT += widgets testlib SOURCES += tst_qstackedlayout.cpp diff --git a/tests/auto/widgets/kernel/qtooltip/qtooltip.pro b/tests/auto/widgets/kernel/qtooltip/qtooltip.pro index 4da8917921..d653fe5d15 100644 --- a/tests/auto/widgets/kernel/qtooltip/qtooltip.pro +++ b/tests/auto/widgets/kernel/qtooltip/qtooltip.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += widgets +CONFIG += testcase +TARGET = tst_qtooltip +QT += widgets testlib SOURCES += tst_qtooltip.cpp CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/widgets/kernel/qwidget/qwidget.pro b/tests/auto/widgets/kernel/qwidget/qwidget.pro index 9c34e0c254..e6ec3b92f9 100644 --- a/tests/auto/widgets/kernel/qwidget/qwidget.pro +++ b/tests/auto/widgets/kernel/qwidget/qwidget.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qwidget -QT += widgets core-private gui-private widgets-private +QT += widgets core-private gui-private widgets-private testlib SOURCES += tst_qwidget.cpp RESOURCES = qwidget.qrc diff --git a/tests/auto/widgets/kernel/qwidget_window/qwidget_window.pro b/tests/auto/widgets/kernel/qwidget_window/qwidget_window.pro index dd5837012c..cf04478bba 100644 --- a/tests/auto/widgets/kernel/qwidget_window/qwidget_window.pro +++ b/tests/auto/widgets/kernel/qwidget_window/qwidget_window.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += widgets +CONFIG += testcase +TARGET = tst_qwidget_window +QT += widgets testlib SOURCES += tst_qwidget_window.cpp x11 { diff --git a/tests/auto/widgets/kernel/qwidgetaction/qwidgetaction.pro b/tests/auto/widgets/kernel/qwidgetaction/qwidgetaction.pro index 3e037c2efb..e4158559a9 100644 --- a/tests/auto/widgets/kernel/qwidgetaction/qwidgetaction.pro +++ b/tests/auto/widgets/kernel/qwidgetaction/qwidgetaction.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += widgets +CONFIG += testcase +TARGET = tst_qwidgetaction +QT += widgets testlib SOURCES += tst_qwidgetaction.cpp -- cgit v1.2.3