diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-10-25 11:59:25 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-25 08:42:23 +0200 |
commit | 55b6e6fdfb14c467d1baab67271f85095929cd2a (patch) | |
tree | 27f45aab926b8ec3c7d6bf0684523845969b4af8 /tests/benchmarks/gui/image | |
parent | 433f5dbbfb1cf4ee8f0763cf5757e71daf62ac19 (diff) |
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 <jason.mcdonald@nokia.com>
Diffstat (limited to 'tests/benchmarks/gui/image')
5 files changed, 5 insertions, 29 deletions
diff --git a/tests/benchmarks/gui/image/blendbench/blendbench.pro b/tests/benchmarks/gui/image/blendbench/blendbench.pro index 0f3c9804ae..74ba0a5920 100644 --- a/tests/benchmarks/gui/image/blendbench/blendbench.pro +++ b/tests/benchmarks/gui/image/blendbench/blendbench.pro @@ -1,12 +1,7 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_blendbench DEPENDPATH += . INCLUDEPATH += . - +QT += testlib # Input SOURCES += main.cpp diff --git a/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro b/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro index 2aefe2422b..7b3ba93737 100644 --- a/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro +++ b/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro @@ -1,11 +1,6 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_imageConversion - +QT += testlib SOURCES += tst_qimageconversion.cpp !contains(QT_CONFIG, no-gif):DEFINES += QTEST_HAVE_GIF diff --git a/tests/benchmarks/gui/image/qimagereader/qimagereader.pro b/tests/benchmarks/gui/image/qimagereader/qimagereader.pro index 9334ee1374..311ffad009 100644 --- a/tests/benchmarks/gui/image/qimagereader/qimagereader.pro +++ b/tests/benchmarks/gui/image/qimagereader/qimagereader.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_bench_qimagereader diff --git a/tests/benchmarks/gui/image/qpixmap/qpixmap.pro b/tests/benchmarks/gui/image/qpixmap/qpixmap.pro index 6addbb43b7..7ba53857cb 100644 --- a/tests/benchmarks/gui/image/qpixmap/qpixmap.pro +++ b/tests/benchmarks/gui/image/qpixmap/qpixmap.pro @@ -1,9 +1,4 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - -QT += gui-private +QT += gui-private testlib TEMPLATE = app TARGET = tst_bench_qpixmap diff --git a/tests/benchmarks/gui/image/qpixmapcache/qpixmapcache.pro b/tests/benchmarks/gui/image/qpixmapcache/qpixmapcache.pro index 25c6c64f68..7f5d829b26 100644 --- a/tests/benchmarks/gui/image/qpixmapcache/qpixmapcache.pro +++ b/tests/benchmarks/gui/image/qpixmapcache/qpixmapcache.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - -TEMPLATE = app TARGET = tst_bench_qpixmapcache TEMPLATE = app +QT += testlib # Input SOURCES += tst_qpixmapcache.cpp |