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: (57 commits)
  QNAM: Add a code comment related to the cache
  QtScript: regression with instanceof operator for QMetaObject wrappers
  QNAM HTTP: Fixed a bug when getting empty files with pipelining
  Fix window transparency on Symbian.
  Tweak the 'normalGeometry' of the widget before setting it.
  Use QDesktopWidget as a status pane observer on Symbian.
  Delay creation of S60 screen furniture.
  Don't use setGeometry() in setWindowState() on Symbian.
  Modify setWindowState() on Symbian to create the native window earlier.
  [tst_bic] Fix compilation in non-X11/Mac/Windows platforms
  Compile on symbian:
  QAudioOutput always uses default output device
  symbian: deploy 4.wav test file properly
  QS60Style: Style draws a focus frame to context menus and popups
  Fix accidental change in QtWebKit
  QNAM HTTP: Pipelining improvement
  Context menu for application is differs from native S60 apps
  No repaint when resizing graphics item with an effect.
  fix qmake conditionals
  QtScript: Add translation context test
  ...

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