Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration

* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (106 commits)
  Fix the include header <qstring.h> -> <QtCore/qstring.h>
  Testlib XML flush: use benchmarkMetricName (identifier) overall instead of benchmarkMetricUnit (human text)
  Update the testlib XML baselines with the unit names from QTestLib
  Renaming a few unexported, private symbols
  tst_selftest: parse benchlib results in XML format too
  tst_selftests: replace a line number with __LINE__ in XML too
  Removed fullscreen responsiveness of softkeys
  tst_selftest: use @INSERT_QT_VERSION_HERE@ to indicate the Qt version.
  fix crash in QXmlStreamReader
  Fixed a QFontEngine leak for QFont objects used in threads.
  The cmd line arguments have not been delegated properly.
  Apply Rhys's fix to qpaintengine_vg.cpp to make it compile
  Fixed QGLWidget::grabFrameBuffer() to honor the 'withAlpha' value.
  Adjusted layout of audiodevice example to use scrollbar.
  win32 backend for low-level audio fixes
  QXmlSchema internals: fix crash with anonymous types
  QNAM HTTP: Fix invoking a method when being destructed right now (2)
  QNAM: Use a reference in appendDownstreamData
  QNAM HTTP: Divide QNetworkReplyImplPrivate::appendDownstreamData
  QNAM HTTP: Avoid one copy
  ...

1 files changed, 16 insertions, 13 deletions

diff --git a/doc/src/platforms/platform-notes.qdoc b/doc/src/platforms/platform-notes.qdoc
index 83f2833..8f5b6a5 100644
--- a/doc/src/platforms/platform-notes.qdoc
+++ b/doc/src/platforms/platform-notes.qdoc
@@ -411,7 +411,7 @@
     \section1 Source Compatibility
 
     Qt for Symbian provides the same level of source compatibility guarantee as
-    given for other platforms.  That is, a program which compiles against a given
+    given for other platforms. That is, a program which compiles against a given
     version of Qt for Symbian will also compile against all future versions of the
     same major release.
 
@@ -496,28 +496,31 @@
 
     \section1 Required Capabilities
 
-    Distributions of Qt are typically signed with \c{All -TCB}. What your
-    application needs to be signed with in order to function with Qt depends
-    on what functionality it uses:
+    The Qt libraries are typically signed with \c{All -TCB} capabilites, but
+    that does not mean your Qt application needs to be signed with the same
+    capabilities to function properly. The capabilities your application needs
+    to function properly depends on which parts of Qt you use, here is an
+    overview:
 
     \table
-    \header \o Technology
+    \header \o Module
             \o Required Symbian Capability
     \row    \o QtCore
-            \o \c PowerMgmt if applications are terminated using QProcess.
+            \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 QtNetwork
-            \o NetworkServices
+            \o \c NetworkServices is basically always required for this module.
     \row    \o QtMultiMedia
             \o \c UserEnvironment if QAudioInput is used.
     \endtable
 
-    Depending on what file paths that are accessed and how AllFiles may be
-    required. Similarly, if the network is accessed indirectly through
-    components such as QtXmlPatterns, QtWebkit or QtScript, the capabilities
-    needs to match accordingly.
+    Note that some modules rely on other modules. If your application uses
+    QtXmlPatterns, QtWebkit or QtScript it may still require \c NetworkServices
+    \o as these modules rely on QtNetwork to go online.
 
-    See individual classes' documentation for specifics. If a class does not
-    mention Symbian capabilities, it requires none.
+    For more information see the documentation of the individual Qt classes. If
+    a class does not mention Symbian capabilities, it requires none.
 
     \section1 Multimedia and Phonon Support