From 55b6e6fdfb14c467d1baab67271f85095929cd2a Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Tue, 25 Oct 2011 11:59:25 +1000 Subject: benchmarks: 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: I48ab0ee64d8348cada2e6c7b27c67b6bbc36280d Reviewed-by: Jason McDonald --- tests/benchmarks/gui/painting/qpainter/qpainter.pro | 6 +----- tests/benchmarks/gui/painting/qregion/qregion.pro | 7 +------ tests/benchmarks/gui/painting/qtbench/qtbench.pro | 6 +----- tests/benchmarks/gui/painting/qtracebench/qtracebench.pro | 6 +----- tests/benchmarks/gui/painting/qtransform/qtransform.pro | 7 +------ 5 files changed, 5 insertions(+), 27 deletions(-) (limited to 'tests/benchmarks/gui/painting') diff --git a/tests/benchmarks/gui/painting/qpainter/qpainter.pro b/tests/benchmarks/gui/painting/qpainter/qpainter.pro index 8d3d7c9549..1a1f218033 100644 --- a/tests/benchmarks/gui/painting/qpainter/qpainter.pro +++ b/tests/benchmarks/gui/painting/qpainter/qpainter.pro @@ -1,9 +1,5 @@ -load(qttest_p4) - -QT += widgets +QT += widgets testlib QT += gui-private widgets-private -# do not run benchmarks by default in 'make check' -CONFIG -= testcase TEMPLATE = app TARGET = tst_bench_qpainter diff --git a/tests/benchmarks/gui/painting/qregion/qregion.pro b/tests/benchmarks/gui/painting/qregion/qregion.pro index 94a6a9d843..99bbd39043 100644 --- a/tests/benchmarks/gui/painting/qregion/qregion.pro +++ b/tests/benchmarks/gui/painting/qregion/qregion.pro @@ -1,13 +1,8 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qregion DEPENDPATH += . INCLUDEPATH += . - +QT += testlib CONFIG += release # Input diff --git a/tests/benchmarks/gui/painting/qtbench/qtbench.pro b/tests/benchmarks/gui/painting/qtbench/qtbench.pro index 8c76c587b0..06c77a93c0 100644 --- a/tests/benchmarks/gui/painting/qtbench/qtbench.pro +++ b/tests/benchmarks/gui/painting/qtbench/qtbench.pro @@ -1,8 +1,4 @@ -load(qttest_p4) -QT += widgets - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase +QT += widgets testlib TEMPLATE = app TARGET = tst_qtbench diff --git a/tests/benchmarks/gui/painting/qtracebench/qtracebench.pro b/tests/benchmarks/gui/painting/qtracebench/qtracebench.pro index 64c1c58293..b0a48c4ef0 100644 --- a/tests/benchmarks/gui/painting/qtracebench/qtracebench.pro +++ b/tests/benchmarks/gui/painting/qtracebench/qtracebench.pro @@ -1,9 +1,5 @@ -load(qttest_p4) - -QT += widgets +QT += widgets testlib QT += core-private gui-private widgets-private -# do not run benchmarks by default in 'make check' -CONFIG -= testcase TEMPLATE = app TARGET = tst_qtracebench diff --git a/tests/benchmarks/gui/painting/qtransform/qtransform.pro b/tests/benchmarks/gui/painting/qtransform/qtransform.pro index 8164f53ba2..e8de3fcbd4 100644 --- a/tests/benchmarks/gui/painting/qtransform/qtransform.pro +++ b/tests/benchmarks/gui/painting/qtransform/qtransform.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qtransform - +QT += testlib SOURCES += tst_qtransform.cpp -- cgit v1.2.3