diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:18:59 +1000 |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:23:14 +1000 |
| commit | 98dd1781d9256f68025d2a2db408f4f5947f3214 (patch) | |
| tree | dbe1424abd90014edb5546c920ca585ed62b46e3 /tests/benchmarks/network | |
| parent | 6c1bdc1854a7700c2b3a345b95f6a2fdca84037d (diff) | |
| parent | fa1b9070af66edb81b2a3735c1951f78b22bd666 (diff) | |
Merge master -> api_changes
Includes fixes for tst_qfiledialog2, tst_qtextedit autotests on mac.
Change-Id: I49cac26894d31291a8339ccc1eb80b6a940f0827
Diffstat (limited to 'tests/benchmarks/network')
6 files changed, 0 insertions, 20 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 bee2adafa1..eccabd5d89 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,12 +1,9 @@ TEMPLATE = app TARGET = tst_bench_qfile_vs_qnetworkaccessmanager -DEPENDPATH += . -INCLUDEPATH += . QT -= gui QT += network testlib CONFIG += release -# Input SOURCES += main.cpp diff --git a/tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro b/tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro index fe2204bb16..9de05b5e65 100644 --- a/tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro +++ b/tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro @@ -1,14 +1,9 @@ TEMPLATE = app TARGET = tst_bench_qnetworkdiskcache -DEPENDPATH += . -INCLUDEPATH += . QT += gui # for QDesktopServices QT += network testlib CONFIG += release -# Input SOURCES += tst_qnetworkdiskcache.cpp - - diff --git a/tests/benchmarks/network/access/qnetworkreply/qnetworkreply.pro b/tests/benchmarks/network/access/qnetworkreply/qnetworkreply.pro index 36eeb23fd0..1618728295 100644 --- a/tests/benchmarks/network/access/qnetworkreply/qnetworkreply.pro +++ b/tests/benchmarks/network/access/qnetworkreply/qnetworkreply.pro @@ -1,12 +1,9 @@ TEMPLATE = app TARGET = tst_bench_qnetworkreply -DEPENDPATH += . -INCLUDEPATH += . QT -= gui QT += network testlib CONFIG += release -# Input SOURCES += tst_qnetworkreply.cpp diff --git a/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro b/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro index e26406fe74..41dae0051b 100644 --- a/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro +++ b/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro @@ -1,12 +1,9 @@ TEMPLATE = app TARGET = tst_bench_qhostinfo -DEPENDPATH += . -INCLUDEPATH += . QT -= gui QT += core-private network network-private testlib CONFIG += release -# Input SOURCES += main.cpp diff --git a/tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro b/tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro index 1ea2f96d78..ebf1891433 100644 --- a/tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro +++ b/tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro @@ -1,12 +1,9 @@ TEMPLATE = app TARGET = tst_bench_qtcpserver -DEPENDPATH += . -INCLUDEPATH += . QT -= gui QT += network testlib CONFIG += release -# Input SOURCES += tst_qtcpserver.cpp diff --git a/tests/benchmarks/network/ssl/qsslsocket/qsslsocket.pro b/tests/benchmarks/network/ssl/qsslsocket/qsslsocket.pro index d71fd86316..a67c0d66df 100644 --- a/tests/benchmarks/network/ssl/qsslsocket/qsslsocket.pro +++ b/tests/benchmarks/network/ssl/qsslsocket/qsslsocket.pro @@ -1,12 +1,9 @@ TEMPLATE = app TARGET = tst_bench_qsslsocket -DEPENDPATH += . -INCLUDEPATH += . QT -= gui QT += network testlib CONFIG += release -# Input SOURCES += tst_qsslsocket.cpp |