diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-11 14:54:37 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-11 14:54:37 (GMT) |
| commit | 7a81735272b5ee065f499a492cca4b4a703e0659 (patch) | |
| tree | c060a7547b64899907a0603c8f891a00d83e7e59 /tests | |
| parent | d134345b02c6813289e67ba6c5ffe6daa1086516 (diff) | |
| parent | 644df27056fcd697713fe2338e6743e0fd067011 (diff) | |
| download | Qt-7a81735272b5ee065f499a492cca4b4a703e0659.zip Qt-7a81735272b5ee065f499a492cca4b4a703e0659.tar.gz Qt-7a81735272b5ee065f499a492cca4b4a703e0659.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
SSL: Fix for capabilities in QSslCertificate auto test
Doc: update symbian capabilities regarding SSL
SSL: Fix crashes/hangs when retrieving CA certificates
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qsslcertificate/qsslcertificate.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/qsslcertificate/qsslcertificate.pro b/tests/auto/qsslcertificate/qsslcertificate.pro index d7671ea..b04dde3 100644 --- a/tests/auto/qsslcertificate/qsslcertificate.pro +++ b/tests/auto/qsslcertificate/qsslcertificate.pro @@ -24,5 +24,6 @@ wince*: { DEFINES += SRCDIR=\\\".\\\" } else:!symbian { DEFINES += SRCDIR=\\\"$$PWD/\\\" - TARGET.CAPABILITY = NetworkServices } + +symbian:TARGET.CAPABILITY = NetworkServices ReadUserData |