From 5bd3e8c8b2ae56cf25b2d35f137952e95703d2d5 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Fri, 7 Oct 2011 15:42:52 +1000 Subject: tests: 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: Ia83fc82c005c73b0df48aa8d7b57968be05ad937 Reviewed-on: http://codereview.qt-project.org/6212 Reviewed-by: Qt Sanity Bot Reviewed-by: Jason McDonald --- tests/auto/headersclean/headersclean.pro | 5 +++-- tests/auto/qsvgdevice/qsvgdevice.pro | 9 +++------ tests/auto/qsvggenerator/qsvggenerator.pro | 10 +++------- tests/auto/qsvgrenderer/qsvgrenderer.pro | 10 +++------- tests/benchmarks/svg/qsvgrenderer/qsvgrenderer.pro | 4 ++-- 5 files changed, 14 insertions(+), 24 deletions(-) diff --git a/tests/auto/headersclean/headersclean.pro b/tests/auto/headersclean/headersclean.pro index 715ea1e..c5b1f33 100644 --- a/tests/auto/headersclean/headersclean.pro +++ b/tests/auto/headersclean/headersclean.pro @@ -1,5 +1,6 @@ -load(qttest_p4) +TARGET = tst_headersclean +CONFIG += testcase SOURCES += tst_headersclean.cpp -QT = core +QT = core testlib contains(QT_CONFIG,svg): QT += svg diff --git a/tests/auto/qsvgdevice/qsvgdevice.pro b/tests/auto/qsvgdevice/qsvgdevice.pro index 91bb2ef..d16fdc2 100644 --- a/tests/auto/qsvgdevice/qsvgdevice.pro +++ b/tests/auto/qsvgdevice/qsvgdevice.pro @@ -1,7 +1,4 @@ -load(qttest_p4) +TARGET = tst_qsvgdevice +CONFIG += testcase SOURCES += tst_qsvgdevice.cpp -QT += xml - - - -QT+=widgets +QT += xml testlib widgets diff --git a/tests/auto/qsvggenerator/qsvggenerator.pro b/tests/auto/qsvggenerator/qsvggenerator.pro index 6699ff0..5c65e15 100644 --- a/tests/auto/qsvggenerator/qsvggenerator.pro +++ b/tests/auto/qsvggenerator/qsvggenerator.pro @@ -1,9 +1,6 @@ -############################################################ -# Project file for autotest for file qsvggenerator.h -############################################################ - -load(qttest_p4) -QT += svg xml +TARGET = tst_qsvggenerator +CONFIG += testcase +QT += svg xml testlib widgets SOURCES += tst_qsvggenerator.cpp @@ -18,4 +15,3 @@ wince* { } else:!symbian { DEFINES += SRCDIR=\\\"$$PWD/\\\" } -QT+=widgets diff --git a/tests/auto/qsvgrenderer/qsvgrenderer.pro b/tests/auto/qsvgrenderer/qsvgrenderer.pro index 768e6e6..4c76254 100644 --- a/tests/auto/qsvgrenderer/qsvgrenderer.pro +++ b/tests/auto/qsvgrenderer/qsvgrenderer.pro @@ -1,9 +1,6 @@ -############################################################ -# Project file for autotest for file qsvgrenderer.h -############################################################ - -load(qttest_p4) -QT += svg +TARGET = tst_qsvgrenderer +CONFIG += testcase +QT += svg testlib widgets SOURCES += tst_qsvgrenderer.cpp RESOURCES += resources.qrc @@ -21,4 +18,3 @@ wince*|symbian { !symbian: { DEFINES += SRCDIR=\\\"$$PWD/\\\" } -QT+=widgets diff --git a/tests/benchmarks/svg/qsvgrenderer/qsvgrenderer.pro b/tests/benchmarks/svg/qsvgrenderer/qsvgrenderer.pro index 9e59eb7..836aa37 100644 --- a/tests/benchmarks/svg/qsvgrenderer/qsvgrenderer.pro +++ b/tests/benchmarks/svg/qsvgrenderer/qsvgrenderer.pro @@ -1,9 +1,9 @@ -load(qttest_p4) +CONFIG += testcase TEMPLATE = app TARGET = tst_bench_qsvgrenderer SOURCES += tst_qsvgrenderer.cpp RESOURCES += qsvgrenderer.qrc -QT += svg +QT += svg testlib -- cgit v1.2.1