diff options
| author | Joona Petrell <joona.t.petrell@nokia.com> | 2011-02-22 04:12:05 (GMT) |
|---|---|---|
| committer | Joona Petrell <joona.t.petrell@nokia.com> | 2011-02-22 04:12:05 (GMT) |
| commit | bf9ca539dc4c5efff801856ad9d3f7e14dabad26 (patch) | |
| tree | a5ae494b6e8a2b33f4345f484ba2ead04aca761e /doc/src/platforms/platform-notes.qdoc | |
| parent | b254be20c03d4dbfc1803cd40dc95d52115b955c (diff) | |
| parent | a34e2ab6f50cc91a4fca5cd7fd7bd22e6495b0c1 (diff) | |
| download | Qt-bf9ca539dc4c5efff801856ad9d3f7e14dabad26.zip Qt-bf9ca539dc4c5efff801856ad9d3f7e14dabad26.tar.gz Qt-bf9ca539dc4c5efff801856ad9d3f7e14dabad26.tar.bz2 | |
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7
Conflicts:
tools/qml/qml.pri
Diffstat (limited to 'doc/src/platforms/platform-notes.qdoc')
| -rw-r--r-- | doc/src/platforms/platform-notes.qdoc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/platforms/platform-notes.qdoc b/doc/src/platforms/platform-notes.qdoc index aac6bb0..de6eb7f 100644 --- a/doc/src/platforms/platform-notes.qdoc +++ b/doc/src/platforms/platform-notes.qdoc @@ -735,9 +735,9 @@ \row \o QtCore \o \c AllFiles when \l{http://developer.symbian.org/wiki/index.php/Capabilities_%28Symbian_Signed%29/AllFiles_Capability}{accessing specific areas.} \row \o QtDeclarative - \o \c NetworkServices is automatically added for this module. + \o \c NetworkServices is automatically added for this module if no capabilities are explicitly specified. \row \o QtNetwork - \o \c NetworkServices is automatically added for this module. + \o \c NetworkServices is automatically added for this module if no capabilities are explicitly specified. \row \o QtNetwork \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), @@ -745,7 +745,7 @@ \row \o QtMultiMedia \o \c UserEnvironment if QAudioInput is used. \row \o QtWebkit - \o \c NetworkServices is automatically added for this module. + \o \c NetworkServices is automatically added for this module if no capabilities are explicitly specified. \endtable \note Some modules rely on other modules. E.g. QtWebkit and QtDeclarative |