diff options
| author | axis <qt-info@nokia.com> | 2011-02-24 17:07:22 +0100 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-02-24 17:07:22 +0100 |
| commit | 2b768ad7d4de4862584762a7d106d9cfcc3416df (patch) | |
| tree | 0ddfe84f345d7e61ce71daa51fbbfb373c3e3106 /tests/auto/networkselftest | |
| parent | bb7d9bcc8e0c617091e91f7a40f3d33f8c1cdec1 (diff) | |
| parent | ca7be48b7a150952a9657d1000941fb986e5bb2b (diff) | |
| download | qt4-tools-2b768ad7d4de4862584762a7d106d9cfcc3416df.tar.gz | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-master
Conflicts:
src/network/access/qnetworkreplyimpl.cpp
tests/auto/moc/tst_moc.cpp
Diffstat (limited to 'tests/auto/networkselftest')
| -rw-r--r-- | tests/auto/networkselftest/networkselftest.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/networkselftest/networkselftest.pro b/tests/auto/networkselftest/networkselftest.pro index 98e981c5c0..2742fcb297 100644 --- a/tests/auto/networkselftest/networkselftest.pro +++ b/tests/auto/networkselftest/networkselftest.pro @@ -12,6 +12,7 @@ wince*: { addFiles.files = rfc3252.txt addFiles.path = . DEPLOYMENT += addFiles + TARGET.CAPABILITY = NetworkServices ReadUserData } else:vxworks*: { DEFINES += SRCDIR=\\\"\\\" } else { |