diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-22 05:16:32 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-22 05:16:32 +1000 |
| commit | ddd53623d5cf2ee151b4c8a683e91101397d7e6c (patch) | |
| tree | 5b2510188f1c19cbe88be0e553484eb2e0b37b21 /doc/src/platforms | |
| parent | 917fe59fbeeb8de04ede0242905eed87855b252d (diff) | |
| parent | de1417c6648a2589f56a7df0603b26387037aa31 (diff) | |
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:
Added support for QMAKE_CLEAN in symbian-sbsv2
Only add NetworkServices capability automatically if no caps are set.
Diffstat (limited to 'doc/src/platforms')
| -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 aac6bb0a60..de6eb7f858 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 |