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/corelib/io | |
| 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/corelib/io')
8 files changed, 8 insertions, 48 deletions
diff --git a/tests/benchmarks/corelib/io/qdir/10000/10000.pro b/tests/benchmarks/corelib/io/qdir/10000/10000.pro index a42cc8f96f..0319f2c195 100644 --- a/tests/benchmarks/corelib/io/qdir/10000/10000.pro +++ b/tests/benchmarks/corelib/io/qdir/10000/10000.pro @@ -1,8 +1,3 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = bench_qdir_10000 DEPENDPATH += . @@ -11,4 +6,4 @@ INCLUDEPATH += . # Input SOURCES += bench_qdir_10000.cpp -QT -= gui +QT = core testlib diff --git a/tests/benchmarks/corelib/io/qdir/tree/tree.pro b/tests/benchmarks/corelib/io/qdir/tree/tree.pro index 38b84cfa32..415580cc46 100644 --- a/tests/benchmarks/corelib/io/qdir/tree/tree.pro +++ b/tests/benchmarks/corelib/io/qdir/tree/tree.pro @@ -1,8 +1,3 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = bench_qdir_tree DEPENDPATH += . @@ -12,4 +7,4 @@ INCLUDEPATH += . SOURCES += bench_qdir_tree.cpp RESOURCES += bench_qdir_tree.qrc -QT -= gui +QT = core testlib diff --git a/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro b/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro index a7400528e3..af3be799c6 100755 --- a/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro +++ b/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro @@ -1,14 +1,9 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qdiriterator DEPENDPATH += . INCLUDEPATH += . -QT -= gui +QT = core testlib CONFIG += release diff --git a/tests/benchmarks/corelib/io/qfile/qfile.pro b/tests/benchmarks/corelib/io/qfile/qfile.pro index aa26732d2e..933469071d 100644 --- a/tests/benchmarks/corelib/io/qfile/qfile.pro +++ b/tests/benchmarks/corelib/io/qfile/qfile.pro @@ -1,11 +1,6 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qfile -QT -= gui +QT = core testlib win32: DEFINES+= _CRT_SECURE_NO_WARNINGS SOURCES += main.cpp diff --git a/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro b/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro index 2c0075f009..0dca21c1a8 100644 --- a/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro +++ b/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro @@ -1,8 +1,3 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qfileinfo DEPENDPATH += . @@ -10,7 +5,7 @@ INCLUDEPATH += . QT -= gui -QT += core-private +QT += core-private testlib CONFIG += release diff --git a/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro b/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro index 54dd0d6861..0dff0ce86e 100755 --- a/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro +++ b/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro @@ -1,15 +1,10 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qiodevice TARGET.EPOCHEAPSIZE = 0x100000 0x2000000 DEPENDPATH += . INCLUDEPATH += . -QT -= gui +QT = core testlib CONFIG += release diff --git a/tests/benchmarks/corelib/io/qtemporaryfile/qtemporaryfile.pro b/tests/benchmarks/corelib/io/qtemporaryfile/qtemporaryfile.pro index 6f42ae0653..6ebee8a659 100644 --- a/tests/benchmarks/corelib/io/qtemporaryfile/qtemporaryfile.pro +++ b/tests/benchmarks/corelib/io/qtemporaryfile/qtemporaryfile.pro @@ -1,14 +1,9 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qtemporaryfile DEPENDPATH += . INCLUDEPATH += . -QT -= gui +QT = core testlib CONFIG += release diff --git a/tests/benchmarks/corelib/io/qurl/qurl.pro b/tests/benchmarks/corelib/io/qurl/qurl.pro index 37106e1bf7..52f7bdc8b6 100644 --- a/tests/benchmarks/corelib/io/qurl/qurl.pro +++ b/tests/benchmarks/corelib/io/qurl/qurl.pro @@ -1,11 +1,6 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_qurl -QT -= gui +QT = core testlib win32: DEFINES+= _CRT_SECURE_NO_WARNINGS SOURCES += main.cpp |