summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorA-Team <ateam@pad.test.qt.nokia.com>2010-11-11 23:00:13 (GMT)
committerA-Team <ateam@pad.test.qt.nokia.com>2010-11-11 23:00:13 (GMT)
commitf966c3f22cd453a47ef6754c24b050bc5c2ac5f0 (patch)
treeb14621094d7c2df8ac4ffad445e823908847ba22 /doc
parent76d9e79d1faf174a7052b197b0fe92425bb85f3a (diff)
parent7a81735272b5ee065f499a492cca4b4a703e0659 (diff)
downloadQt-f966c3f22cd453a47ef6754c24b050bc5c2ac5f0.zip
Qt-f966c3f22cd453a47ef6754c24b050bc5c2ac5f0.tar.gz
Qt-f966c3f22cd453a47ef6754c24b050bc5c2ac5f0.tar.bz2
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'doc')
-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