Document updates to Qt for Symbian installation instructions and platform notes.

2 files changed, 374 insertions, 291 deletions

diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index ef010b4..bec9ee4 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -79,6 +79,8 @@ for your platform from the following list.
 \snippet doc/src/snippets/code/doc_src_installation.qdoc 1
 
     Type \c{./configure -help} to get a list of all available options.
+    The \l{Configuration Options for Qt} page gives a brief overview
+    of these.
 
     To create the library and compile all the demos, examples, tools,
     and tutorials, type:
@@ -218,7 +220,8 @@ for your platform from the following list.
 
 \snippet doc/src/snippets/code/doc_src_installation.qdoc 8
 
-    Type \c{configure -help} to get a list of all available options.
+    Type \c{configure -help} to get a list of all available options. The
+    \l{Configuration Options for Qt} page gives a brief overview of these.
 
     If you have multiple compilers installed, and want to build the Qt library
     using a specific compiler, you must specify a \c qmake specification.
@@ -433,7 +436,9 @@ in the \l{Qt for Windows CE Requirements} document.
 
     If you want to configure Qt for another platform or with other
     options, type \c{configure -help} to get a list of all available
-    options. See the \c README file for the list of supported platforms.
+    options. The \l{Configuration Options for Qt} page gives a brief
+    overview of these. See the \c README file for the list of supported
+    platforms.
 
 \section1 Step 4: Build Qt Library
 
@@ -505,7 +510,10 @@ in the \l{Qt for the Symbian platform Requirements} document.
 
 \section1 Step 1: Install Qt
 
-        Run \c{qt-symbian-opensource-%VERSION%.exe} and follow the instructions.
+        Download the \c {Qt libraries 4.x for Windows} package (for \c minGW or \c {VS 2008}) 
+        from the \l {http://qt.nokia.com/downloads#qt-lib}{downloads} page.
+        
+        Run the downloaded package and follow the instructions.
 
         \note Qt must be installed on the same drive as the Symbian SDK you are
         using, and the install path must not contain any spaces.
@@ -626,6 +634,10 @@ Binary Package} document.
 \snippet doc/src/snippets/code/doc_src_installation.qdoc 31
     (to build the tools using MinGW, and the libraries using SBSv2)
 
+    Type \c{./configure -help} to get a list of all available options.
+    The \l{Configuration Options for Qt} page gives a brief overview
+    of these.
+
     SBSv2 (also known as \l{http://developer.symbian.org/wiki/index.php/Introduction_to_RAPTOR} {Raptor}) 
     is a next-generation Symbian build system. SBSv2 is not officially supported
     by any of the S60 SDKs currently available from Forum Nokia.
@@ -643,23 +655,39 @@ Binary Package} document.
     Congratulations, Qt is now ready to use.
 
 \section1 Step 7: Installing Qt Libraries on the Device
-
-    To run the demo on a real device, you first have to install
-    the Qt libraries on the device:
+    
+    To run a Qt application on a device, it must have Qt libraries installed.
+    
+    Symbian devices have a pre-installed Qt as follows:
+    \list
+    \o Symbian Anna devices have the pre-installed Qt, Qt Mobility, and Qt Webkit.
+    \o Symbian Belle and later devices have the pre-installed Qt on the device firmware.
+    \endlist
+    
+    \l {http://www.developer.nokia.com/Community/Wiki/Nokia_Smart_Installer_for_Symbian}
+    {Nokia Smart Installer for Symbian} deploys the required Qt libraries to supported S60 
+    and Symbian devices if the libraries are not pre-installed.
+    
+    Nokia Developer site's \l {http://www.developer.nokia.com/Devices/Device_specifications/?filter1=qt}
+    {Device specifications} provide information on which devices have a
+    pre-installed Qt and the used Qt version.
+    
+    To create your own Qt installation package, do as follows:
 
 \snippet doc/src/snippets/code/doc_src_installation.qdoc 29
 
-    The Qt libraries are built with "All -Tcb" capability, so that
-    they can support all types of application.
-    If you don't have a suitable certificate, it is possible to patch
-    the binaries as follows:
-
-    If you have no certificate, build a self signed Qt:
-\snippet doc/src/snippets/code/doc_src_installation.qdoc 34
+    The Qt libraries are built with "All -Tcb" capability, so they can support 
+    all types of applications. If you don't have a suitable certificate, you can 
+    patch the binaries in either of the following ways:
+    
+    \list
+    \o If you have no certificate, build a self-signed Qt:
+    \snippet doc/src/snippets/code/doc_src_installation.qdoc 34
 
-    If you have a symbian-signed developer certificate, specify the
+    \o If you have a symbian-signed developer certificate, specify the
     capabilities you can sign for, for example:
-\snippet doc/src/snippets/code/doc_src_installation.qdoc 35
+    \snippet doc/src/snippets/code/doc_src_installation.qdoc 35
+    \endlist
 
 \section1 Running Qt demos
 
@@ -740,6 +768,9 @@ to build the libraries using RVCT or
 
 to build the libraries using GCCE.
 
+Type \c{./configure -help} to get a list of all available options.
+The \l{Configuration Options for Qt} page gives a brief overview
+of these.
 
 \section1 Step 5: Build Qt
 
@@ -1303,7 +1334,12 @@ We hope you will enjoy using Qt.
     \brief Setting up the Symbian platform environment for Qt.
     \previouspage General Qt Requirements
 
-    Qt for the Symbian platform requires the following software installed on your development PC:
+    \l {http://qt.nokia.com/downloads}{Qt SDK} provides all the necessary tools 
+    and libraries for developing Qt applications. However, if you want to build 
+    Qt itself for Symbian, follow the instructions below.
+    
+    Qt for the Symbian platform requires the following software installed on 
+    your development PC:
     \list
         \o \l{http://www.forum.nokia.com/Library/Tools_and_downloads/Other/Carbide.c++/}{Carbide.c++ v2.3.0 or higher recommended}.
            \list
@@ -1368,253 +1404,263 @@ We hope you will enjoy using Qt.
 
 /*!
     \page configure-options.html
-    \title Configure options for Qt
+    \title Configuration Options for Qt
     \ingroup installation
-    \brief Brief description of available options building Qt.
-	
-	This page gives a brief description of the different options
-	available when building Qt using configure. To build Qt using
-	default options, just call configure from the command line like
-	showed below. If you would like to customize your build, please
-	use the options listed in the following tables.
-	
- 	\c {.\configure.exe}
- 
-	\section2 Cross platform options:
- 
-   \table
-   \header \o Option  \o Description \o Note
-   \row   \o \c {-buildkey } <key> \o Build the Qt library and plugins
-   using the specified \o
-   \row   \o \c {<key>} \o When the library loads plugins, it will only
-   load those that have a matching <key>. \o
-   \row   \o \c {-release } \o Compile and link Qt with debugging turned off. \o
-   \row   \o \c {-debug } \o Compile and link Qt with debugging turned on.
-   \o Default value.
-   \row   \o \c {-debug-and-release} \o Compile and link two Qt libraries,
-   with and without debugging turned on. \o This option denotes a default
-   value and needs to be evaluated. If the evaluation succeeds, the
-   feature is included.
-   \row   \o \c {-opensource} \o Compile and link the Open-Source Edition
-   of Qt. \o
-   \row   \o \c {-commercial } \o Compile and link the Commercial Edition
-   of Qt. \o
-   \row   \o \c {-developer-build} \o Compile and link Qt with Qt developer
-   options including auto-tests exporting) \o
-   \row   \o \c {-shared} \o Create and use shared Qt libraries. \o Default
-   value.
-   \row   \o \c {-static} \o Create and use static Qt libraries. \o
-   \row   \o \c {-ltcg} \o Use Link Time Code Generation. \o Apply to release
-   builds only.
-   \row   \o \c {-no-ltcg} \o Do not use Link Time Code Generation. \o Default
-   value.
-   \row   \o \c {-no-fast} \o Configure Qt normally by generating Makefiles for
-   all project files. \o Default value.
-   \row   \o \c {-fast} \o Configure Qt quickly by generating Makefiles only for
-   library and subdirectory targets. \o All other Makefiles are created as
-   wrappers which will in turn run qmake.
-   \row   \o \c {-no-exceptions} \o Disable exceptions on platforms that support
-   it. \o 
-   \row   \o \c {-exceptions} \o Enable exceptions on platforms that support it.
-   \o Default value.
-   \row   \o \c {-no-accessibility} \o Do not compile Windows Active
-   Accessibility support. \o
-   \row   \o \c {-accessibility} \o Compile Windows Active Accessibility
-   support. \o Default value.
-   \row   \o \c {-no-stl} \o Do not compile STL support. \o
-   \row   \o \c {-stl} \o Compile STL support. \o Default value.
-   \row   \o \c {-no-sql-<driver>} \o Disable SQL <driver> entirely, by default
-   none are turned on. \o
-   \row   \o \c {-qt-sql-<driver>} \o Enable a SQL <driver> in the Qt Library.
-   \o
-   \row   \o \c {-plugin-sql-<driver>} \o Enable SQL <driver> as a plugin to be
-   linked to at run time. \o Available values for <driver>: mysql, psql,
-   oci, odbc, tds, db2, sqlite, sqlite2, ibase. Drivers marked with a
-   '+' during configure have been detected as available on this system.
-   \row   \o \c {-system-sqlite} \o Use sqlite from the operating system. \o
-   \row   \o \c {-no-qt3support} \o Disables the Qt 3 support functionality. \o
-   \row   \o \c {-no-opengl} \o Disables OpenGL functionality \o
-   \row   \o \c {-opengl <api>} \o Enable OpenGL support with specified API
-   version. \o Available values for <api>: desktop - Enable support for
-   Desktop OpenGL (Default), es1 - Enable support for OpenGL ES Common
-   Profile, es2 - Enable support for OpenGL ES 2.0. 
-   \row   \o \c {-no-openvg} \o Disables OpenVG functionality \o Default value.
-   \row   \o \c {-openvg} \o Enables OpenVG functionality \o Requires EGL
-   support, typically supplied by an OpenGL or other graphics
-   implementation. 
-   \row   \o \c {-platform <spec> } \o The operating system and compiler you
-   are building on. \o The default value is %QMAKESPEC%.
-   \row   \o \c {-xplatform <spec> } \o The operating system and compiler you
-   are cross compiling for. \o See the README file for a list of supported
-   operating systems and compilers.
-   \row   \o \c {-qtnamespace <namespace>} \o Wraps all Qt library code in
-   'namespace name {..} \o
-   \row   \o \c {-qtlibinfix <infix>} \o Renames all Qt* libs to Qt*<infix>
-   \o
-   \row   \o \c {-D <define>} \o Add an explicit define to the preprocessor.
-   \o
-   \row   \o \c {-I <includepath>} \o Add an explicit include path. \o
-   \row   \o \c {-L <librarypath>} \o Add an explicit library path. \o
-   \row   \o \c {-l <libraryname>} \o Add an explicit library name, residing
-   in a librarypath. \o
-   \row   \o \c {-graphicssystem <sys>} \o Specify which graphics system should
-   be used. \o Available values for <sys>: * raster - Software rasterizer,
-   opengl - Using OpenGL acceleration, experimental!, openvg - Using
-   OpenVG acceleration, experimental! 
-   \row   \o \c {-help, -h, -?} \o Display this information. \o
-   \endtable
-	
- \section2 Third Party Libraries:
-   \table
-		\header \o Option  \o Description \o Note
-		\row   \o \c {-qt-zlib} \o Use the zlib bundled with Qt. \o
-		\row   \o \c {-system-zlib} \o Use zlib from the operating system.
-		\o See http://www.gzip.org/zlib
-		\row   \o \c {-no-gif} \o Do not compile GIF reading support. 
-		\o This option denotes a default value and needs to be evaluated.
-		If the evaluation succeeds, the feature is included.
-		\row   \o \c {-qt-gif} \o Compile GIF reading support. \o See also
-		src/gui/image/qgifhandler_p.h
-		\row   \o \c {-no-libpng} \o Do not compile PNG support. \o
-		\row   \o \c {-qt-libpng} \o Use the libpng bundled with Qt.
-		\o This option denotes a default value and needs to be evaluated.
-		If the evaluation succeeds, the feature is included.
-		\row   \o \c {-system-libpng} \o Use libpng from the operating system.
-		\o See http://www.libpng.org/pub/png
-		\row   \o \c {-no-libmng} \o Do not compile MNG support. \o This option
-		denotes a default value and needs to be evaluated. If the evaluation
-		succeeds, the feature is included.
-		\row   \o \c {-qt-libmng} \o Use the libmng bundled with Qt. \o
-		\row   \o \c {-system-libmng} \o Use libmng from the operating system.
-		\o See http://www.libmng.com
-		\row   \o \c {-no-libtiff} \o Do not compile TIFF support. \o This option
-		denotes a default value and needs to be evaluated. If the evaluation
-		succeeds, the feature is included.
-		\row   \o \c {-qt-libtiff} \o Use the libtiff bundled with Qt. \o
-		\row   \o \c {-system-libtiff} \o Use libtiff from the operating system.
-		\o See http://www.libtiff.org
-		\row   \o \c {-no-libjpeg} \o Do not compile JPEG support. \o This option
-		denotes a default value and needs to be evaluated. If the evaluation
-		succeeds, the feature is included.
-		\row   \o \c {-qt-libjpeg} \o Use the libjpeg bundled with Qt. \o
-		\row   \o \c {-system-libjpeg} \o Use libjpeg from the operating system.
-		\o See http://www.ijg.org. This option denotes a default value and
-		needs to be evaluated. If the evaluation succeeds, the feature is
-		included.
-	\endtable
-	
-  \section2 Qt for Windows only:
-  \table
-   \header \o Option  \o Description \o Note
-   \row   \o \c {-no-dsp} \o Do not generate VC++ .dsp files. \o
-   \row   \o \c {-dsp} \o Generate VC++ .dsp files, only if spec "win32-msvc".
-   \o Default value.
-   \row   \o \c {-no-vcproj} \o Do not generate VC++ .vcproj files. \o
-   \row   \o \c {-vcproj} \o Generate VC++ .vcproj files, only if platform
-   "win32-msvc.net". \o Default value.
-   \row   \o \c {-no-incredibuild-xge} \o Do not add IncrediBuild XGE distribution
-   commands to custom build steps. \o
-   \row   \o \c {-incredibuild-xge} \o Add IncrediBuild XGE distribution commands
-   to custom build steps. This will distribute MOC and UIC steps, and other
-   custom buildsteps which are added to the INCREDIBUILD_XGE variable.
-   \o The IncrediBuild distribution commands are only added to Visual Studio
-   projects. This option denotes a default value and needs to be evaluated.
-   If the evaluation succeeds, the feature is included.
-   \row   \o \c {-no-plugin-manifests} \o Do not embed manifests in plugins. \o
-   \row   \o \c {-plugin-manifests} \o Embed manifests in plugins. 
-   \o Default value.
-   \row   \o \c {-no-qmake} \o Do not compile qmake. \o
-   \row   \o \c {-qmake} \o Compile qmake. \o Default value
-   \row   \o \c {-dont-process} \o Do not generate Makefiles/Project files. This
-   will override -no-fast if specified. \o
-   \row   \o \c {-process} \o Generate Makefiles/Project files. \o Default value.
-   \row   \o \c {-no-rtti} \o Do not compile runtime type information. \o
-   \row   \o \c {-rtti} \o Compile runtime type information. \o Default value.
-   \row   \o \c {-no-mmx} \o Do not compile with use of MMX instructions \o
-   \row   \o \c {-mmx} \o Compile with use of MMX instructions \o This option
-   denotes a default value and needs to be evaluated. If the evaluation
-   succeeds, the feature is included.
-   \row   \o \c {-no-3dnow} \o Do not compile with use of 3DNOW instructions \o
-   \row   \o \c {-3dnow} \o Compile with use of 3DNOW instructions \o This
-   option denotes a default value and needs to be evaluated. If the
-   evaluation succeeds, the feature is included.
-   \row   \o \c {-no-sse} \o Do not compile with use of SSE instructions \o
-   \row   \o \c {-sse} \o Compile with use of SSE instructions \o This option
-   denotes a default value and needs to be evaluated. If the evaluation
-   succeeds, the feature is included.
-   \row   \o \c {-no-sse2} \o Do not compile with use of SSE2 instructions \o
-   \row   \o \c {-sse2} \o Compile with use of SSE2 instructions \o This option
-   denotes a default value and needs to be evaluated. If the evaluation
-   succeeds, the feature is included.
-   \row   \o \c {-no-openssl} \o Do not compile in OpenSSL support \o
-   \row   \o \c {-openssl} \o Compile in run-time OpenSSL support \o This option
-   denotes a default value and needs to be evaluated. If the evaluation
-   succeeds, the feature is included.
-   \row   \o \c {-openssl-linked} \o Compile in linked OpenSSL support \o
-   \row   \o \c {-no-dbus} \o Do not compile in D-Bus support \o
-   \row   \o \c {-dbus} \o Compile in D-Bus support and load libdbus-1 dynamically.
-   \o This option denotes a default value and needs to be evaluated.
-   If the evaluation succeeds, the feature is included.
-   \row   \o \c {-dbus-linked} \o Compile in D-Bus support and link to
-   libdbus-1 \o
-   \row   \o \c {-no-phonon} \o Do not compile in the Phonon module \o
-   \row   \o \c {-phonon} \o Compile the Phonon module. \o Phonon is built if a
-   decent C++ compiler is used. This option denotes a default value and needs
-   to be evaluated. If the evaluation succeeds, the feature is included.
-   \row   \o \c {-no-phonon-backend} \o Do not compile the platform-specific
-   Phonon backend-plugin \o
-   \row   \o \c {-phonon-backend} \o Compile in the platform-specific Phonon
-   backend-plugin \o Default value.
-   \row   \o \c {-no-multimedia} \o Do not compile the multimedia module \o
-   \row   \o \c {-multimedia} \o Compile in multimedia module \o Default value.
-   \row   \o \c {-no-audio-backend} \o Do not compile in the platform audio
-   backend into QtMultimedia \o
-   \row   \o \c {-audio-backend} \o Compile in the platform audio backend into
-   QtMultimedia \o This option denotes a default value and needs to be
-   evaluated. If the evaluation succeeds, the feature is included.
-   \row   \o \c {-no-webkit} \o Do not compile in the WebKit module \o
-   \row   \o \c {-webkit} \o Compile in the WebKit module \o WebKit is built
-   if a decent C++ compiler is used. This option denotes a default value
-   and needs to be evaluated. If the evaluation succeeds, the feature is
-   included.
-   \row   \o \c {-webkit-debug} \o Compile in the WebKit module with debug
-   symbols. \o
-   \row   \o \c {-no-script} \o Do not build the QtScript module. \o
-   \row   \o \c {-script} \o Build the QtScript module. \o This option
-   denotes a default value and needs to be evaluated. If the evaluation
-   succeeds, the feature is included.
-   \row   \o \c {-no-scripttools} \o Do not build the QtScriptTools module. \o
-   \row   \o \c {-scripttools} \o Build the QtScriptTools module. \o This
-   option denotes a default value and needs to be evaluated. If the
-   evaluation succeeds, the feature is included.
-   \row   \o \c {-no-declarative} \o Do not build the declarative module \o
-   \row   \o \c {-declarative} \o Build the declarative module \o This option
-   denotes a default value and needs to be evaluated. If the evaluation
-   succeeds, the feature is included.
-   \row   \o \c {-no-declarative-debug} \o Do not build the declarative debugging
-   support \o
-   \row   \o \c {-declarative-debug} \o Build the declarative debugging support 
-   \o Default value.
-   \row   \o \c {-arch <arch>} \o Specify an architecture. \o Available values for
-   <arch>:  * windows, windowsce, symbian, boundschecker, generic.
-   \row   \o \c {-no-style-<style>} \o Disable <style> entirely. \o
-   \row   \o \c {-qt-style-<style>} \o Enable <style> in the Qt Library. 
-   \o Available styles: * windows, + windowsxp, + windowsvista,  
-   * plastique, * cleanlooks, * motif, * cde, windowsce, windowsmobile,
-   s60
-   \row   \o \c {-no-native-gestures} \o Do not use native gestures on Windows 7.
-   \o 
-   \row   \o \c {-native-gestures} \o Use native gestures on Windows 7.
-   \o Default value.
-   \row   \o \c {-no-mp} \o Do not use multiple processors for compiling with MSVC
-   \o Default value.
-   \row   \o \c {-mp} \o Use multiple processors for compiling with MSVC (-MP) \o
-   \row   \o \c {-loadconfig <config>} \o Run configure with the parameters from file 
-   configure_<config>.cache. \o
-   \row   \o \c {-saveconfig <config>} \o Run configure and save the parameters in
-   file configure_<config>.cache. \o
-   \row   \o \c {-redo} \o Run configure with the same parameters as last time. \o
-\endtable
+    \brief Brief description of available options for building Qt.
+
+    This page gives a brief description of the different options available when
+    building Qt using the \c configure script or \c configure.exe binary.
+    To build Qt using the default options, just call configure from the command
+    line as shown below.
+
+    When building on Linux, Mac OS X and Unix platforms:
+
+    \c{./configure}
+
+    On Windows, run the corresponding executable:
+
+    \c{.\configure.exe}
+
+    If you would like to customize your build, please use the options listed in
+    the following tables. To see the full list of options, invoke the configure
+    tool with the \c -help command line option.
+
+    \section2 Cross platform options:
+
+    \table
+    \header \o Option  \o Description \o Note
+    \row   \o \c {-buildkey} <key> \o Build the Qt library and plugins
+    using the specified \o
+    \row   \o \c {<key>} \o When the library loads plugins, it will only
+    load those that have a matching <key>. \o
+    \row   \o \c {-release} \o Compile and link Qt with debugging turned off. \o
+    \row   \o \c {-debug} \o Compile and link Qt with debugging turned on.
+    \o Default value.
+    \row   \o \c {-debug-and-release} \o Compile and link two Qt libraries,
+    with and without debugging turned on. \o This option denotes a default
+    value and needs to be evaluated. If the evaluation succeeds, the
+    feature is included.
+    \row   \o \c {-opensource} \o Compile and link the Open-Source Edition
+    of Qt. \o
+    \row   \o \c {-commercial} \o Compile and link the Commercial Edition
+    of Qt. \o
+    \row   \o \c {-developer-build} \o Compile and link Qt with Qt developer
+    options including auto-tests exporting) \o
+    \row   \o \c {-shared} \o Create and use shared Qt libraries. \o Default
+    value.
+    \row   \o \c {-static} \o Create and use static Qt libraries. \o
+    \row   \o \c {-ltcg} \o Use Link Time Code Generation. \o Apply to release
+    builds only.
+    \row   \o \c {-no-ltcg} \o Do not use Link Time Code Generation. \o Default
+    value.
+    \row   \o \c {-no-fast} \o Configure Qt normally by generating Makefiles for
+    all project files. \o Default value.
+    \row   \o \c {-fast} \o Configure Qt quickly by generating Makefiles only for
+    library and subdirectory targets. \o All other Makefiles are created as
+    wrappers which will in turn run qmake.
+    \row   \o \c {-no-exceptions} \o Disable exceptions on platforms that support
+    it. \o
+    \row   \o \c {-exceptions} \o Enable exceptions on platforms that support it.
+    \o Default value.
+    \row   \o \c {-no-accessibility} \o Do not compile Windows Active
+    Accessibility support. \o
+    \row   \o \c {-accessibility} \o Compile Windows Active Accessibility
+    support. \o Default value.
+    \row   \o \c {-no-stl} \o Do not compile STL support. \o
+    \row   \o \c {-stl} \o Compile STL support. \o Default value.
+    \row   \o \c {-no-sql-<driver>} \o Disable SQL <driver> entirely, by default
+    none are turned on. \o
+    \row   \o \c {-qt-sql-<driver>} \o Enable a SQL <driver> in the Qt Library.
+    \o
+    \row   \o \c {-plugin-sql-<driver>} \o Enable SQL <driver> as a plugin to be
+    linked to at run time. \o Available values for <driver>: mysql, psql,
+    oci, odbc, tds, db2, sqlite, sqlite2, ibase. Drivers marked with a
+    '+' during configure have been detected as available on this system.
+    \row   \o \c {-system-sqlite} \o Use sqlite from the operating system. \o
+    \row   \o \c {-no-qt3support} \o Disables the Qt 3 support functionality. \o
+    \row   \o \c {-no-opengl} \o Disables OpenGL functionality \o
+    \row   \o \c {-opengl <api>} \o Enable OpenGL support with specified API
+    version. \o Available values for <api>: desktop - Enable support for
+    Desktop OpenGL (Default), es1 - Enable support for OpenGL ES Common
+    Profile, es2 - Enable support for OpenGL ES 2.0.
+    \row   \o \c {-no-openvg} \o Disables OpenVG functionality \o Default value.
+    \row   \o \c {-openvg} \o Enables OpenVG functionality \o Requires EGL
+    support, typically supplied by an OpenGL or other graphics
+    implementation.
+    \row   \o \c {-platform <spec>} \o The operating system and compiler you
+    are building on. \o The default value is %QMAKESPEC%.
+    \row   \o \c {-xplatform <spec>} \o The operating system and compiler you
+    are cross compiling for. \o See the README file for a list of supported
+    operating systems and compilers.
+    \row   \o \c {-qtnamespace <namespace>} \o Wraps all Qt library code in
+    'namespace name {..} \o
+    \row   \o \c {-qtlibinfix <infix>} \o Renames all Qt* libs to Qt*<infix>
+    \o
+    \row   \o \c {-D <define>} \o Add an explicit define to the preprocessor.
+    \o
+    \row   \o \c {-I <includepath>} \o Add an explicit include path. \o
+    \row   \o \c {-L <librarypath>} \o Add an explicit library path. \o
+    \row   \o \c {-l <libraryname>} \o Add an explicit library name, residing
+    in a librarypath. \o
+    \row   \o \c {-graphicssystem <sys>} \o Specify which graphics system should
+    be used. \o Available values for <sys>: * raster - Software rasterizer,
+    opengl - Using OpenGL acceleration, experimental!, openvg - Using
+    OpenVG acceleration, experimental!
+    \row   \o \c {-help, -h, -?} \o Display this information. \o
+    \endtable
+
+    \section2 Third Party Libraries
+
+    \table
+    \header \o Option  \o Description \o Note
+    \row   \o \c {-qt-zlib} \o Use the zlib bundled with Qt. \o
+    \row   \o \c {-system-zlib} \o Use zlib from the operating system.
+    \o See http://www.gzip.org/zlib
+    \row   \o \c {-no-gif} \o Do not compile GIF reading support.
+    \o This option denotes a default value and needs to be evaluated.
+    If the evaluation succeeds, the feature is included.
+    \row   \o \c {-qt-gif} \o Compile GIF reading support. \o See also
+    src/gui/image/qgifhandler_p.h
+    \row   \o \c {-no-libpng} \o Do not compile PNG support. \o
+    \row   \o \c {-qt-libpng} \o Use the libpng bundled with Qt.
+    \o This option denotes a default value and needs to be evaluated.
+    If the evaluation succeeds, the feature is included.
+    \row   \o \c {-system-libpng} \o Use libpng from the operating system.
+    \o See http://www.libpng.org/pub/png
+    \row   \o \c {-no-libmng} \o Do not compile MNG support. \o This option
+    denotes a default value and needs to be evaluated. If the evaluation
+    succeeds, the feature is included.
+    \row   \o \c {-qt-libmng} \o Use the libmng bundled with Qt. \o
+    \row   \o \c {-system-libmng} \o Use libmng from the operating system.
+    \o See http://www.libmng.com
+    \row   \o \c {-no-libtiff} \o Do not compile TIFF support. \o This option
+    denotes a default value and needs to be evaluated. If the evaluation
+    succeeds, the feature is included.
+    \row   \o \c {-qt-libtiff} \o Use the libtiff bundled with Qt. \o
+    \row   \o \c {-system-libtiff} \o Use libtiff from the operating system.
+    \o See http://www.libtiff.org
+    \row   \o \c {-no-libjpeg} \o Do not compile JPEG support. \o This option
+    denotes a default value and needs to be evaluated. If the evaluation
+    succeeds, the feature is included.
+    \row   \o \c {-qt-libjpeg} \o Use the libjpeg bundled with Qt. \o
+    \row   \o \c {-system-libjpeg} \o Use libjpeg from the operating system.
+    \o See http://www.ijg.org. This option denotes a default value and
+    needs to be evaluated. If the evaluation succeeds, the feature is
+    included.
+    \endtable
+
+    \section2 Qt for Windows only:
+    \table
+    \header \o Option  \o Description \o Note
+    \row   \o \c {-no-dsp} \o Do not generate VC++ .dsp files. \o
+    \row   \o \c {-dsp} \o Generate VC++ .dsp files, only if spec "win32-msvc".
+    \o Default value.
+    \row   \o \c {-no-vcproj} \o Do not generate VC++ .vcproj files. \o
+    \row   \o \c {-vcproj} \o Generate VC++ .vcproj files, only if platform
+    "win32-msvc.net". \o Default value.
+    \row   \o \c {-no-incredibuild-xge} \o Do not add IncrediBuild XGE distribution
+    commands to custom build steps. \o
+    \row   \o \c {-incredibuild-xge} \o Add IncrediBuild XGE distribution commands
+    to custom build steps. This will distribute MOC and UIC steps, and other
+    custom buildsteps which are added to the INCREDIBUILD_XGE variable.
+    \o The IncrediBuild distribution commands are only added to Visual Studio
+    projects. This option denotes a default value and needs to be evaluated.
+    If the evaluation succeeds, the feature is included.
+    \row   \o \c {-no-plugin-manifests} \o Do not embed manifests in plugins. \o
+    \row   \o \c {-plugin-manifests} \o Embed manifests in plugins.
+    \o Default value.
+    \row   \o \c {-no-qmake} \o Do not compile qmake. \o
+    \row   \o \c {-qmake} \o Compile qmake. \o Default value
+    \row   \o \c {-dont-process} \o Do not generate Makefiles/Project files. This
+    will override -no-fast if specified. \o
+    \row   \o \c {-process} \o Generate Makefiles/Project files. \o Default value.
+    \row   \o \c {-no-rtti} \o Do not compile runtime type information. \o
+    \row   \o \c {-rtti} \o Compile runtime type information. \o Default value.
+    \row   \o \c {-no-mmx} \o Do not compile with use of MMX instructions \o
+    \row   \o \c {-mmx} \o Compile with use of MMX instructions \o This option
+    denotes a default value and needs to be evaluated. If the evaluation
+    succeeds, the feature is included.
+    \row   \o \c {-no-3dnow} \o Do not compile with use of 3DNOW instructions \o
+    \row   \o \c {-3dnow} \o Compile with use of 3DNOW instructions \o This
+    option denotes a default value and needs to be evaluated. If the
+    evaluation succeeds, the feature is included.
+    \row   \o \c {-no-sse} \o Do not compile with use of SSE instructions \o
+    \row   \o \c {-sse} \o Compile with use of SSE instructions \o This option
+    denotes a default value and needs to be evaluated. If the evaluation
+    succeeds, the feature is included.
+    \row   \o \c {-no-sse2} \o Do not compile with use of SSE2 instructions \o
+    \row   \o \c {-sse2} \o Compile with use of SSE2 instructions \o This option
+    denotes a default value and needs to be evaluated. If the evaluation
+    succeeds, the feature is included.
+    \row   \o \c {-no-openssl} \o Do not compile in OpenSSL support \o
+    \row   \o \c {-openssl} \o Compile in run-time OpenSSL support \o This option
+    denotes a default value and needs to be evaluated. If the evaluation
+    succeeds, the feature is included.
+    \row   \o \c {-openssl-linked} \o Compile in linked OpenSSL support \o
+    \row   \o \c {-no-dbus} \o Do not compile in D-Bus support \o
+    \row   \o \c {-dbus} \o Compile in D-Bus support and load libdbus-1 dynamically.
+    \o This option denotes a default value and needs to be evaluated.
+    If the evaluation succeeds, the feature is included.
+    \row   \o \c {-dbus-linked} \o Compile in D-Bus support and link to
+    libdbus-1 \o
+    \row   \o \c {-no-phonon} \o Do not compile in the Phonon module \o
+    \row   \o \c {-phonon} \o Compile the Phonon module. \o Phonon is built if a
+    decent C++ compiler is used. This option denotes a default value and needs
+    to be evaluated. If the evaluation succeeds, the feature is included.
+    \row   \o \c {-no-phonon-backend} \o Do not compile the platform-specific
+    Phonon backend-plugin \o
+    \row   \o \c {-phonon-backend} \o Compile in the platform-specific Phonon
+    backend-plugin \o Default value.
+    \row   \o \c {-no-multimedia} \o Do not compile the multimedia module \o
+    \row   \o \c {-multimedia} \o Compile in multimedia module \o Default value.
+    \row   \o \c {-no-audio-backend} \o Do not compile in the platform audio
+    backend into QtMultimedia \o
+    \row   \o \c {-audio-backend} \o Compile in the platform audio backend into
+    QtMultimedia \o This option denotes a default value and needs to be
+    evaluated. If the evaluation succeeds, the feature is included.
+    \row   \o \c {-no-webkit} \o Do not compile in the WebKit module \o
+    \row   \o \c {-webkit} \o Compile in the WebKit module \o WebKit is built
+    if a decent C++ compiler is used. This option denotes a default value
+    and needs to be evaluated. If the evaluation succeeds, the feature is
+    included.
+    \row   \o \c {-webkit-debug} \o Compile in the WebKit module with debug
+    symbols. \o
+    \row   \o \c {-no-script} \o Do not build the QtScript module. \o
+    \row   \o \c {-script} \o Build the QtScript module. \o This option
+    denotes a default value and needs to be evaluated. If the evaluation
+    succeeds, the feature is included.
+    \row   \o \c {-no-scripttools} \o Do not build the QtScriptTools module. \o
+    \row   \o \c {-scripttools} \o Build the QtScriptTools module. \o This
+    option denotes a default value and needs to be evaluated. If the
+    evaluation succeeds, the feature is included.
+    \row   \o \c {-no-declarative} \o Do not build the declarative module \o
+    \row   \o \c {-declarative} \o Build the declarative module \o This option
+    denotes a default value and needs to be evaluated. If the evaluation
+    succeeds, the feature is included.
+    \row   \o \c {-no-declarative-debug} \o Do not build the declarative debugging
+    support \o
+    \row   \o \c {-declarative-debug} \o Build the declarative debugging support
+    \o Default value.
+    \row   \o \c {-arch <arch>} \o Specify an architecture. \o Available values for
+    <arch>:  * windows, windowsce, symbian, boundschecker, generic.
+    \row   \o \c {-no-style-<style>} \o Disable <style> entirely. \o
+    \row   \o \c {-qt-style-<style>} \o Enable <style> in the Qt Library.
+    \o Available styles: * windows, + windowsxp, + windowsvista,
+    * plastique, * cleanlooks, * motif, * cde, windowsce, windowsmobile,
+    s60
+    \row   \o \c {-no-native-gestures} \o Do not use native gestures on Windows 7.
+    \o
+    \row   \o \c {-native-gestures} \o Use native gestures on Windows 7.
+    \o Default value.
+    \row   \o \c {-no-mp} \o Do not use multiple processors for compiling with MSVC
+    \o Default value.
+    \row   \o \c {-mp} \o Use multiple processors for compiling with MSVC (-MP) \o
+    \row   \o \c {-loadconfig <config>} \o Run configure with the parameters from file
+    configure_<config>.cache. \o
+    \row   \o \c {-saveconfig <config>} \o Run configure and save the parameters in
+    file configure_<config>.cache. \o
+    \row   \o \c {-redo} \o Run configure with the same parameters as last time. \o
+    \endtable
 
 \section2 Qt for Windows CE only:
    \table
diff --git a/doc/src/platforms/platform-notes.qdoc b/doc/src/platforms/platform-notes.qdoc
index 231c58a..d33a7a9 100644
--- a/doc/src/platforms/platform-notes.qdoc
+++ b/doc/src/platforms/platform-notes.qdoc
@@ -622,9 +622,7 @@
     \ingroup platform-specific
     \brief Information about the state of support for the Symbian platform.
 
-    As with any port, the maturity for Qt for Symbian has not yet reached the
-    same level as other established Qt ports. This page documents the current
-    notes for the Symbian port.
+    This page documents the current notes for the Symbian port.
 
     \section1 Source Compatibility
 
@@ -635,18 +633,39 @@
 
     \section1 Binary Compatibility
 
-    As with every supported platform, we will strive to maintain
-    application behavior and binary compatibility throughout the lifetime of
-    the Qt 4.x series. However, due to the fact that Symbian support is newly
-    added in 4.6.0, there is a slight possibility that minor corrections to the
-    application binary interface (ABI) might be required in 4.6.1, in order to
-    ensure compatibility going forward. Any such change will be clearly
-    documented in the release notes for 4.6.1.
+    As with every supported platform, Qt strives to maintain application 
+    behavior and binary compatibility throughout the lifetime of the Qt 4.x 
+    major version and on the Symbian devices that support Qt. Symbian support in 
+    Qt SDK and Ovi Store were introduced with Qt 4.6. Each Qt release contains 
+    bug fixes that might change the API behavior and thereby affect application 
+    compatibility.
+
+    In addition, Symbian devices have different input methods, such as different 
+    keyboard styles or touch input, screen sizes, memory, and CPU and GPU 
+    capabilities. Therefore, you must test applications on specific target 
+    devices to ensure compatibility. In order to build applications that are 
+    supported also on earlier devices, select the target in Qt SDK carefully. 
+    Generally, an earlier target (such as S60 5th Edition) is supported on a 
+    larger number of devices than a later target (such as Symbian Belle).
 
     \section1 Supported Devices
 
-    See the list of supported devices at
-    http://wiki.forum.nokia.com/index.php/Nokia_Smart_Installer_for_Symbian#Supported_Devices
+    \l {http://www.developer.nokia.com/Community/Wiki/Nokia_Smart_Installer_for_Symbian#Supported_Devices}{Nokia Smart Installer for Symbian}
+    documentation lists supported devices.
+
+    Qt versions are supported by Symbian devices as follows:
+    \list
+    \o Qt 4.6 is supported by S60 3rd Edition feature pack 1 and newer devices 
+    through \l {http://www.developer.nokia.com/Community/Wiki/Nokia_Smart_Installer_for_Symbian}{Smart Installer}.
+    \o Qt 4.7.3 is supported by S60 5th Edition and newer devices.
+    \endlist
+    
+    Symbian devices have a pre-installed Qt support as follows:
+    \list
+    \o Symbian Anna: Qt 4.7.3 in C: drive.
+    \o Symbian Belle: Qt 4.7.4 in device firmware (ROM).
+    \endlist
+    
 
     \section1 Supported Functionality
 
@@ -671,12 +690,24 @@
     \header \o Technology
             \o Note
     \row    \o QtSql
-            \o The only driver supported is SQLite.
+            \o The only supported driver is SQLite.
     \row    \o QtMultimedia
-            \o Although the module itself is supported, no backend for Symbian
-               is currently available. However, there is a backend available
-               for Phonon.
+            \o For support details see \l {Multimedia and Phonon Support} section.
     \endtable
+    
+    It is not recommended to use the following Qt widgets:
+    \list
+    \o QFileDialog with the \c DontUseNativeDialog option
+    \o QColorDialog with the \c DontUseNativeDialog option
+    \o QFontDialog
+    \o QWizard
+    \o QCalendarWidget
+    \o QDateTimeEdit
+    \o QMdiArea
+    \o QMdiSubWindow
+    \o QDockWidget
+    \o QPrintPreviewWidget
+    \endlist
 
     \section1 Compiler Notes
 
@@ -711,7 +742,7 @@
     \row    \o QtCore
             \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.}
+            \o \c AllFiles when \l{http://wiki.forum.nokia.com/index.php/Capabilities_%28Symbian_Signed%29/AllFiles_Capability}{accessing specific areas.}
     \row    \o QtDeclarative
             \o \c NetworkServices is automatically added for this module if no capabilities are explicitly specified.
     \row    \o QtNetwork
@@ -733,28 +764,34 @@
     For more information see the documentation of the individual Qt classes. If
     a class does not mention Symbian capabilities, it requires none.
 
+    \target Multimedia and Phonon Support
     \section1 Multimedia and Phonon Support
 
-    Qt provides a backend for Qt's Phonon module, which supports
-    video and sound playback through Symbian's Multimedia Framework, MMF.
+    Qt provides a high-level API for multimedia functionality with
+    (\l{http://doc.qt.nokia.com/qtmobility/multimedia.html}).
+
+    Qt also provides a backend for Qt's Phonon module, which supports video and
+    sound playback through Symbian's Multimedia Framework, MMF. Note that Phonon
+    support is not being extended, and that Qt's multimedia module will
+    take over for Phonon at a later stage.
 
-    In this release the support is experimental. Video playback may have
-    flickering issues, and support for effects and playback queueing is
-    incomplete.
+    In this release the support is experimental. Video playback may show
+    artifacts when the video is moved or resized (for instance during
+    orientation flips). This problem is present on S60 5th Edition and earlier
+    versions, and on Symbian^3 systems.
 
     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 in preference over the MMF
-    plugin. If the Helix plugin fails to load, the MMF plugin, if present on
-    the device, will be loaded instead.
+    In addition, there exists a backend for the Helix framework. However, since
+    it is not shipped with Qt, its availability depends on the Symbian platform
+    in use. If the MFF plugin fails to load, the Helix plugin, if present on the
+    device, will be loaded instead.
 
     \section1 Hardware Accelerated Rendering
 
-    The default graphics system on Symbian^3 is OpenVG, which uses OpenVG
+    The default graphics system on Symbian Anna is OpenVG, which uses OpenVG
     hardware to accelerate \l QPainter functions. There are a few exceptions,
     where Qt will use software rendering fallback.
 
@@ -771,7 +808,7 @@
 
     \section1 QtOpenGL Support in Symbian
 
-     Qt 4.7 introduces the \l {QtOpenGL} module to Symbian^3. QtOpenGL is
+     Qt 4.7 introduces the \l {QtOpenGL} module. QtOpenGL is
      supported on devices which support OpenGL ES 2.0. Symbian platforms prior
      to Symbian^3 are not supported.