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/kernel/qhostinfo | |
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/kernel/qhostinfo')
-rw-r--r-- | tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro | 3 |
1 files changed, 0 insertions, 3 deletions
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 |