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/network | |
| 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/network')
6 files changed, 5 insertions, 35 deletions
diff --git a/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/qfile_vs_qnetworkaccessmanager.pro b/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/qfile_vs_qnetworkaccessmanager.pro index 33e6923a6a..bee2adafa1 100644 --- a/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/qfile_vs_qnetworkaccessmanager.pro +++ b/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/qfile_vs_qnetworkaccessmanager.pro @@ -1,15 +1,10 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qfile_vs_qnetworkaccessmanager DEPENDPATH += . INCLUDEPATH += . QT -= gui -QT += network +QT += network testlib CONFIG += release diff --git a/tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro b/tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro index 19cf771bcc..fe2204bb16 100644 --- a/tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro +++ b/tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro @@ -1,8 +1,3 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qnetworkdiskcache DEPENDPATH += . diff --git a/tests/benchmarks/network/access/qnetworkreply/qnetworkreply.pro b/tests/benchmarks/network/access/qnetworkreply/qnetworkreply.pro index de1487d489..36eeb23fd0 100644 --- a/tests/benchmarks/network/access/qnetworkreply/qnetworkreply.pro +++ b/tests/benchmarks/network/access/qnetworkreply/qnetworkreply.pro @@ -1,15 +1,10 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qnetworkreply DEPENDPATH += . INCLUDEPATH += . QT -= gui -QT += network +QT += network testlib CONFIG += release diff --git a/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro b/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro index 42396b8cdb..e26406fe74 100755 --- a/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro +++ b/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro @@ -1,15 +1,10 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qhostinfo DEPENDPATH += . INCLUDEPATH += . QT -= gui -QT += core-private network network-private +QT += core-private network network-private testlib CONFIG += release diff --git a/tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro b/tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro index fc27158e17..1ea2f96d78 100644 --- a/tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro +++ b/tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro @@ -1,15 +1,10 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qtcpserver DEPENDPATH += . INCLUDEPATH += . QT -= gui -QT += network +QT += network testlib CONFIG += release diff --git a/tests/benchmarks/network/ssl/qsslsocket/qsslsocket.pro b/tests/benchmarks/network/ssl/qsslsocket/qsslsocket.pro index 52a443f7f7..d71fd86316 100644 --- a/tests/benchmarks/network/ssl/qsslsocket/qsslsocket.pro +++ b/tests/benchmarks/network/ssl/qsslsocket/qsslsocket.pro @@ -1,15 +1,10 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qsslsocket DEPENDPATH += . INCLUDEPATH += . QT -= gui -QT += network +QT += network testlib CONFIG += release |