summaryrefslogtreecommitdiffstats
path: root/tests/auto/qnetworkrequest/qnetworkrequest.pro
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-05-20 14:36:25 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-05-20 14:36:25 (GMT)
commite4dc3567af533df2e57425952c4609726515d2cd (patch)
tree72824b5efc9a4d6ed9f099d34404076245e164fa /tests/auto/qnetworkrequest/qnetworkrequest.pro
parenta36e8ca7afd0c15e5ec73bf4ea21464ab89a3662 (diff)
parentdbfedcb31961579499fcb5342ccc42311191bcd4 (diff)
downloadQt-e4dc3567af533df2e57425952c4609726515d2cd.zip
Qt-e4dc3567af533df2e57425952c4609726515d2cd.tar.gz
Qt-e4dc3567af533df2e57425952c4609726515d2cd.tar.bz2
Merge remote branch 'origin/master'
Conflicts: src/gui/dialogs/qnspanelproxy_mac.mm
Diffstat (limited to 'tests/auto/qnetworkrequest/qnetworkrequest.pro')
-rw-r--r--tests/auto/qnetworkrequest/qnetworkrequest.pro1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/qnetworkrequest/qnetworkrequest.pro b/tests/auto/qnetworkrequest/qnetworkrequest.pro
index f576ba2..f96fd3b 100644
--- a/tests/auto/qnetworkrequest/qnetworkrequest.pro
+++ b/tests/auto/qnetworkrequest/qnetworkrequest.pro
@@ -2,3 +2,4 @@ load(qttest_p4)
SOURCES += tst_qnetworkrequest.cpp
QT = core network
+symbian: TARGET.CAPABILITY = NetworkServices