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 /doc | |
| 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 'doc')
| -rw-r--r-- | doc/src/platforms/platform-notes.qdoc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/src/platforms/platform-notes.qdoc b/doc/src/platforms/platform-notes.qdoc index dbedc1d..9c5f3c8 100644 --- a/doc/src/platforms/platform-notes.qdoc +++ b/doc/src/platforms/platform-notes.qdoc @@ -739,6 +739,9 @@ \o \c AllFiles when \l{http://developer.symbian.org/wiki/index.php/Capabilities_%28Symbian_Signed%29/AllFiles_Capability}{accessing specific areas.} \row \o QtNetwork \o \c NetworkServices is basically always required for this module. + \o \c ReadUserData is required to include all the phone's SSL certificates in the system's default CA certificate list + (for example those added by the user or stored in the SIM card), + without this capability only the CA certs built into the phone are used. \row \o QtMultiMedia \o \c UserEnvironment if QAudioInput is used. \endtable |