Merge remote branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
	configure
	qmake/generators/win32/msbuild_objectmodel.cpp
	src/gui/image/qpnghandler.cpp
	src/network/access/qnetworkaccessdatabackend.cpp
	src/opengl/qgl_x11egl.cpp
	tests/auto/qnetworkreply/tst_qnetworkreply.cpp

1 files changed, 9 insertions, 4 deletions

diff --git a/doc/src/platforms/platform-notes.qdoc b/doc/src/platforms/platform-notes.qdoc
index 9c5f3c8..177d3f6 100644
--- a/doc/src/platforms/platform-notes.qdoc
+++ b/doc/src/platforms/platform-notes.qdoc
@@ -737,18 +737,23 @@
             \o \c PowerMgmt if QProcess::kill(...) or QProcess::terminate(...) is called.
     \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.
+    \row    \o QtNetwork
+            \o \c NetworkServices is automatically added for this module.
     \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.
+    \row    \o QtWebkit
+            \o \c NetworkServices is automatically added for this module.
     \endtable
 
-    Note that some modules rely on other modules. If your application uses
-    QtXmlPatterns, QtWebkit or QtScript it may still require \c NetworkServices
-    as these modules rely on QtNetwork to go online.
+    \note Some modules rely on other modules. E.g. QtWebkit and QtDeclarative
+    depend on QtNetwork and therefore any application that
+    depends on these modules is also likely to need \c NetworkServices capability.
 
     For more information see the documentation of the individual Qt classes. If
     a class does not mention Symbian capabilities, it requires none.