diff options
author | David Boddie <david.boddie@nokia.com> | 2010-11-17 12:56:03 (GMT) |
---|---|---|
committer | David Boddie <david.boddie@nokia.com> | 2010-11-17 12:56:03 (GMT) |
commit | a34730e837bc1430011028dba11bbf5a4672789d (patch) | |
tree | e3a255dc51cada6c680d9110b855f46ba99804bd /doc/src/platforms | |
parent | b5d26bfb348b6a99529ecf9ab66845e7eacd4732 (diff) | |
parent | 88c2e6f8f9f968c6bfe4ca0c0e3e54365a3e0c82 (diff) | |
download | Qt-a34730e837bc1430011028dba11bbf5a4672789d.zip Qt-a34730e837bc1430011028dba11bbf5a4672789d.tar.gz Qt-a34730e837bc1430011028dba11bbf5a4672789d.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'doc/src/platforms')
-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 |