Merge branch '4.6'

Conflicts:
	src/corelib/io/qdatastream.h

6 files changed, 37 insertions, 26 deletions

diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 1a20be9..539c1d5 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -599,14 +599,14 @@ If you are using pre-built binaries, follow the instructions
 
     \o  Build Qt
 
-        To build Qt for the device, type:
-
-        \snippet doc/src/snippets/code/doc_src_installation.qdoc 28
-        
         To build Qt for the emulator, type:
 
         \snippet doc/src/snippets/code/doc_src_installation.qdoc 24
 
+        To build Qt for the device, type:
+
+        \snippet doc/src/snippets/code/doc_src_installation.qdoc 28
+        
         Congratulations, Qt is now ready to use.
 
     \o  Running Qt demos
diff --git a/doc/src/images/graphicseffect-bloom.png b/doc/src/images/graphicseffect-bloom.png
new file mode 100644
index 0000000..dace7eb
--- /dev/null
+++ b/doc/src/images/graphicseffect-bloom.png
diff --git a/doc/src/images/graphicseffect-effects.png b/doc/src/images/graphicseffect-effects.png
index 3709014..609bef9 100644
--- a/doc/src/images/graphicseffect-effects.png
+++ b/doc/src/images/graphicseffect-effects.png
diff --git a/doc/src/platforms/platform-notes.qdoc b/doc/src/platforms/platform-notes.qdoc
index d455463..5be66f8 100644
--- a/doc/src/platforms/platform-notes.qdoc
+++ b/doc/src/platforms/platform-notes.qdoc
@@ -411,6 +411,24 @@
 
     For information about mixing exceptions with symbian leaves,
     see \l{Exception Safety with Symbian}
+
+    \section1 Multimedia and Phonon Support
+
+    Qt provides a backend for Qt's multimedia module, Phonon, which supports
+    video and sound playback through Symbian's Multimedia Framework, MMF.
+
+    In this release the support is experimental. Video playback may have
+    flickering issues, and support for effects and playback queueing is
+    incomplete.
+
+    The audio and video formats that Phonon supports depends on what support
+    the platform provides for MMF. The emulator is known to have limited
+    codec support.
+
+    In addition, there exists a backend for the Helix framework. However, due
+    to it not shipping with Qt, its availability depends on the Symbian
+    platform in use. If available, it is loaded instead of the MMF plugin.
+
 */
 
 /*!
diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc
index 03d9b29..eafae14 100644
--- a/doc/src/qt4-intro.qdoc
+++ b/doc/src/qt4-intro.qdoc
@@ -605,21 +605,12 @@
     functions to query audio devices for which audio formats they
     support.
 
-    \section1 Classes and Functions Introduced in 4.6
+    \section1 Classes, functions, and other items introduced in 4.6
 
-    Links to class, function, and macro documentation.
+    Links to classes, function, and other items that were added in
+    4.6.
 
-    \section2 Classes
-
-    Classes introduced in Qt 4.6.
-
-    \sincelist classes
-
-    \section2 Functions & Macros
-
-    Fuctions and macros introduced in Qt 4.6.
-
-    \sincelist functions
+    \sincelist 4.6
 
 */
 
diff --git a/doc/src/s60-introduction.qdoc b/doc/src/s60-introduction.qdoc
index 045d740..d0a1976 100644
--- a/doc/src/s60-introduction.qdoc
+++ b/doc/src/s60-introduction.qdoc
@@ -90,7 +90,7 @@
     \row \o \c debug-armv5   \o Build debug binaries for hardware using RVCT.
     \row \o \c release-armv5 \o Build release binaries for hardware using RVCT.
     \row \o \c run           \o Run the emulator binaries from the build directory.
-    \row \o \c sis          \o Create signed \c .sis file for project.
+    \row \o \c sis           \o Create signed \c .sis file for project.
     \endtable
 
     The following lines perform a debug build for the emulator
@@ -106,7 +106,7 @@
     To install your own applications on hardware, you need signed \c .sis file.
     The signed \c .sis file can be created with \c make \c sis target. \c sis target
     is only supported for executables or projects with \c DEPLOYMENT statements.
-    By default the \c sis target will create signed \.sis file for last build
+    By default the \c sis target will create signed \c .sis file for last build
     target. For example, the following sequence will generate the needed makefiles, 
     build the project for \c debug-winscw and \c release-armv5, and create 
     self-signed \c .sis file for \c release-armv5 target:
@@ -119,8 +119,10 @@
     
     \table
     \row \o \c QT_SIS_OPTIONS      \o Options accepted by \c .sis creation. 
-                                       Currently only -i, install the package right away 
-                                       using PC suite, is supported.
+                                       -i, install the package right away using PC suite.
+                                       -c=<file>, read certificate information from a file.
+                                       Execute \c{perl createpackage.pl} for more information
+                                       about options.
                                        By default no otions are given.
     \row \o \c QT_SIS_TARGET       \o Target for which \c .sis file is created.
                                        Accepted values are build targets listed in 
@@ -133,13 +135,13 @@
                                        By default empty. 
     \endtable    
     
-    The environment variables for \c make can be given as an parameters. For example:
-    
-    \snippet doc/src/snippets/code/doc_src_s60-introduction.qdoc 3    
-    
-    The above example is identical to:
+    For example:
     
     \snippet doc/src/snippets/code/doc_src_s60-introduction.qdoc 4        
+
+    The environment variables for \c make can also be given as parameters:
+    
+    \snippet doc/src/snippets/code/doc_src_s60-introduction.qdoc 3        
     
     If you want to install the program immediately, make sure that the device
     is connected to the computer in "PC Suite" mode, and run \c sis target