diff options
author | Peter Yard <peter.yard@nokia.com> | 2010-05-14 00:17:40 (GMT) |
---|---|---|
committer | Peter Yard <peter.yard@nokia.com> | 2010-05-14 00:17:40 (GMT) |
commit | 124e9a761b3cab7414d3ddeaa8e8f2455b6598ad (patch) | |
tree | 518c22b7317c5646d2ce0adc5deb5818b2ea0af6 /tests/auto/qnetworkcookie/qnetworkcookie.pro | |
parent | dcc9a7e72fe4c283df59378d08d75aecfa3b3b05 (diff) | |
parent | ac519ee416e06f4ab471f102da306f94de21c90d (diff) | |
download | Qt-124e9a761b3cab7414d3ddeaa8e8f2455b6598ad.zip Qt-124e9a761b3cab7414d3ddeaa8e8f2455b6598ad.tar.gz Qt-124e9a761b3cab7414d3ddeaa8e8f2455b6598ad.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Conflicts:
examples/declarative/dial/dial-example.qml
Diffstat (limited to 'tests/auto/qnetworkcookie/qnetworkcookie.pro')
-rw-r--r-- | tests/auto/qnetworkcookie/qnetworkcookie.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/qnetworkcookie/qnetworkcookie.pro b/tests/auto/qnetworkcookie/qnetworkcookie.pro index 95d8b6e..2f31138 100644 --- a/tests/auto/qnetworkcookie/qnetworkcookie.pro +++ b/tests/auto/qnetworkcookie/qnetworkcookie.pro @@ -2,3 +2,4 @@ load(qttest_p4) SOURCES += tst_qnetworkcookie.cpp QT = core network +symbian: TARGET.CAPABILITY = NetworkServices |