summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2010-11-11 23:00:11 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2010-11-11 23:00:11 (GMT)
commitce35bb2c0bd3f9ca451d9099177692eaa261b8a5 (patch)
tree58cebbdc81e13a9dbed5a3f4eda6fbc5ad09efeb /doc/src
parentad925d41019d5e5c47143ab91f775f970995ad0d (diff)
parent7a81735272b5ee065f499a492cca4b4a703e0659 (diff)
downloadQt-ce35bb2c0bd3f9ca451d9099177692eaa261b8a5.zip
Qt-ce35bb2c0bd3f9ca451d9099177692eaa261b8a5.tar.gz
Qt-ce35bb2c0bd3f9ca451d9099177692eaa261b8a5.tar.bz2
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/platforms/platform-notes.qdoc3
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