Merge branch '4.8'

Conflicts:
	doc/src/declarative/whatsnew.qdoc
	doc/src/examples/orientation.qdoc
	doc/src/examples/webftpclient.qdoc
	examples/declarative/ui-components/main/qml/pics/niagara_falls.jpg
	src/corelib/global/qglobal.cpp
	src/gui/text/qglyphs.cpp
	src/gui/text/qplatformfontdatabase_qpa.cpp

14 files changed, 441 insertions, 387 deletions

diff --git a/doc/src/declarative/qtbinding.qdoc b/doc/src/declarative/qtbinding.qdoc
index 02d88ae..da87db2 100644
--- a/doc/src/declarative/qtbinding.qdoc
+++ b/doc/src/declarative/qtbinding.qdoc
@@ -108,7 +108,7 @@ These methods are shown below. Naturally these approaches are not exclusive; you
 these methods throughout your application as appropriate.
 
 
-\section2 Loading QML components from C++
+\section2 Loading QML Components from C++
 
 A QML document can be loaded with QDeclarativeComponent or QDeclarativeView. QDeclarativeComponent
 loads a QML component as a C++ object; QDeclarativeView also does this,
@@ -180,7 +180,7 @@ required \c objectName. It is better for the C++ implementation to know as littl
 the QML user interface implementation and the composition of the QML object tree.
 
 
-\section2 Embedding C++ objects into QML components
+\section2 Embedding C++ Objects into QML Components
 
 When loading a QML scene into a C++ application, it can be useful to directly embed C++ data into
 the QML object. QDeclarativeContext enables this by exposing data to the context of a QML
@@ -231,7 +231,7 @@ in QML views.
 Also see the QDeclarativeContext documentation for more information.
 
 
-\section2 Defining new QML elements
+\section2 Defining New QML Elements
 
 While new QML elements can be \l {Defining New Components}{defined in QML}, they can also be
 defined by C++ classes; in fact, many of the core \l {QML Elements} are implemented through
@@ -270,7 +270,7 @@ For more information on defining new QML elements, see the \l {Tutorial: Writing
 
 
 
-\section1 Exchanging data between QML and C++
+\section1 Exchanging Data between QML and C++
 
 QML and C++ objects can communicate with one another through signals, slots and property
 modifications. For a C++ object, any data that is exposed to Qt's \l{The Meta-Object System}{Meta-Object System}
@@ -279,7 +279,7 @@ the QML side, all QML object data is automatically made available to the meta-ob
 be accessed from C++.
 
 
-\section2 Calling functions
+\section2 Calling Functions
 
 QML functions can be called from C++ and vice-versa.
 
@@ -314,7 +314,7 @@ same name but different arguments, the correct function will be called according
 the types of arguments that are provided.
 
 
-\section2 Receiving signals
+\section2 Receiving Signals
 
 All QML signals are automatically available to C++, and can be connected to using QObject::connect()
 like any ordinary Qt C++ signal. In return, any C++ signal can be received by a QML object using
@@ -373,7 +373,7 @@ class that is emitting the signal, and that the enum is registered using Q_ENUMS
 See \l {Using enumerations of a custom type} below for details.
 
 
-\section2 Modifying properties
+\section2 Modifying Properties
 
 Any properties declared in a QML object are automatically accessible from C++. Given a QML item
 like this:
@@ -454,7 +454,7 @@ To allow a custom C++ type to be created or used in QML, the C++ class must be r
 type using qmlRegisterType(), as shown in the \l {Defining new QML elements} section above.
 
 
-\section2 JavaScript arrays and objects
+\section2 JavaScript Arrays and Objects
 
 There is built-in support for automatic type conversion between QVariantList and JavaScript
 arrays, and QVariantMap and JavaScript objects.
@@ -489,7 +489,7 @@ parameter, the value can be created as a JavaScript array or object in the QML
 side, and is automatically converted to a QVariantList or QVariantMap when it is passed to C++.
 
 
-\section2 Using enumerations of a custom type
+\section2 Using Enumerations of a Custom Type
 
 To use an enumeration from a custom C++ component, the enumeration must be declared with Q_ENUMS() to
 register it with Qt's meta object system. For example, the following C++ type has a \c Status enum:
@@ -511,22 +511,22 @@ the \l {Extending QML Functionalities using C++} reference documentation for
 more information.
 
 
-\section2 Using enumeration values as signal parameters
+\section2 Using Enumeration Values as Signal Parameters
 
 C++ signals may pass enumeration values as signal parameters to QML, providing that the enumeration
 and the signal are declared within the same class, or that the enumeration value is one of those declared
 in the \l {Qt}{Qt Namespace}.
 
 Additionally, if a C++ signal with an enum parameter should be connectable to a QML function using the
-\l {Connecting signals to methods and other signals}{connect()} function, the enum type must be
-registered using qRegisterMetaType().
+\l{QML Signal and Handler Event System#Connecting Signals to Methods and Signals}{connect()}
+function, the enum type must be registered using qRegisterMetaType().
 
 For QML signals, enum values may be used as signal parameters using the \c int type:
 
 \snippet doc/src/snippets/declarative/qtbinding/enums/standalone.qml 1
 
 
-\section2 Automatic type conversion from strings
+\section2 Automatic Type Conversion from Strings
 
 As a convenience, some basic types can be specified in QML using format strings to make it easier to
 pass simple values from QML to C++.
diff --git a/doc/src/declarative/righttoleft.qdoc b/doc/src/declarative/righttoleft.qdoc
index 7db6136..89e5147 100644
--- a/doc/src/declarative/righttoleft.qdoc
+++ b/doc/src/declarative/righttoleft.qdoc
@@ -106,7 +106,7 @@ Applying mirroring in this manner does not change the actual value of the releva
 direction of positioners and model views that takes the mirroring into account. Similarly the \l Text,
 \l TextInput and \l TextEdit elements have gained the read-only property \c effectiveHorizontalAlignment
 for querying the effective visual alignment of text. For anchors, the read only
-\l {Item::anchors}{anchors.mirrored} property reflects whether anchors have been mirrored.
+\l {Item::anchors.top}{anchors.mirrored} property reflects whether anchors have been mirrored.
 
 Note that application layouts and animations that are defined using \l {Item::}{x} property values (as
 opposed to anchors or positioner elements) are not affected by the \l LayoutMirroring attached property.
diff --git a/doc/src/declarative/whatsnew.qdoc b/doc/src/declarative/whatsnew.qdoc
index 04638fb..69c8877 100644
--- a/doc/src/declarative/whatsnew.qdoc
+++ b/doc/src/declarative/whatsnew.qdoc
@@ -194,7 +194,7 @@ Text {
 }
 \endcode
 
-\e {import Qt 4.7} continues to work so existing applications wont break even
+\e {import Qt 4.7} continues to work so existing applications won't break even
 if they aren't updated, but it is recommended that all import statements be
 modified to the new form.
 */
diff --git a/doc/src/examples/fingerpaint.qdoc b/doc/src/examples/fingerpaint.qdoc
index eaef4eb..7f4d77c 100644
--- a/doc/src/examples/fingerpaint.qdoc
+++ b/doc/src/examples/fingerpaint.qdoc
@@ -29,8 +29,12 @@
     \example touch/fingerpaint
     \title Finger Paint Example
 
-    The Finger Paint example shows the use of touch with a custom widget
+    The Finger Paint example shows the use of a touchscreen with a custom widget
     to create a simple painting application.
 
     \image touch-fingerpaint-example.png
+
+    This example was specifically designed to work with a touchscreen, using
+    QTouchEvent instead of QMouseEvent to handle user input over the custom
+    widget. As a result, it is not possible to draw with the mouse cursor.
 */
diff --git a/doc/src/examples/orientation.qdoc b/doc/src/examples/orientation.qdoc
index 8b84229..cfe1757 100644
--- a/doc/src/examples/orientation.qdoc
+++ b/doc/src/examples/orientation.qdoc
@@ -130,7 +130,7 @@
 
     Synchronizing both UIs like this might become unfeasible when there are
     many things that can change. In that case it is better to make use of the
-    \l{An Introduction to Model/View Programming}{Model-View-Controller pattern}
+    \l{Introduction to Model/View Programming}{Model-View-Controller pattern}
     more extensively and share the content between both portrait and landscape
     widgets. Then an interface for displaying and manipulating it can be tailor
     made for both orientations.
diff --git a/doc/src/examples/webftpclient.qdoc b/doc/src/examples/webftpclient.qdoc
index 156dedd..469b645 100644
--- a/doc/src/examples/webftpclient.qdoc
+++ b/doc/src/examples/webftpclient.qdoc
@@ -144,8 +144,8 @@
     implementation provided by QFtp to perform the low level work.
 
     In the \c FtpReply class, we need to reimplement four functions in the
-    QIODevice API to ensure that it will work correctly. These functions,
-    \l{QIODevice::}{abort()}, \l{QIODevice::}{bytesAvailable()},
+    API to ensure that it will work correctly. These functions,
+    \l{QNetworkReply::}{abort()}, \l{QIODevice::}{bytesAvailable()},
     \l{QIODevice::}{isSequential()}, \l{QIODevice::}{readData()},
     rely on the rest of the implementation to fill a QByteArray with data and
     use an integer offset to track how much has been read from the device by
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index 1abeae9..c116ce3 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -483,3 +483,8 @@
     \externalpage http://www.symbiansigned.com
     \title Symbian Signed
 */
+
+/*!
+    \externalpage http://accessibility.linuxfoundation.org/a11yspecs/ia2/docs/html/_accessible_event_i_d_8idl.html
+    \title AccessibleEventID.idl File Reference
+*/
diff --git a/doc/src/frameworks-technologies/model-view-programming.qdoc b/doc/src/frameworks-technologies/model-view-programming.qdoc
index 58b51e5..2345990 100644
--- a/doc/src/frameworks-technologies/model-view-programming.qdoc
+++ b/doc/src/frameworks-technologies/model-view-programming.qdoc
@@ -1934,6 +1934,13 @@
     \l{QSortFilterProxyModel::lessThan()}{lessThan()} function to perform custom
     comparisons.
 
+    \section3 Custom data models
+
+    QIdentityProxyModel instances do not sort or filter the structure of the source model,
+    but provide a base class for creating a data proxy. This could be useful on top of a
+    QFileSystemModel for example to provide different colours for the BackgroundRole for
+    different types of files.
+
     \section1 Model subclassing reference
 
     Model subclasses need to provide implementations of many of the virtual functions
diff --git a/doc/src/getting-started/gettingstartedqt.qdoc b/doc/src/getting-started/gettingstartedqt.qdoc
index 18f85f1..2cd303b 100644
--- a/doc/src/getting-started/gettingstartedqt.qdoc
+++ b/doc/src/getting-started/gettingstartedqt.qdoc
@@ -374,7 +374,7 @@
     \code
 25        Notepad::Notepad()
 26        {
-27            saveAction = new QAction(tr("&Open"), this);
+27            openAction = new QAction(tr("&Open"), this);
 28            saveAction = new QAction(tr("&Save"), this);
 29            exitAction = new QAction(tr("E&xit"), this);
 30
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 26ccf88..fd04e49 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -47,7 +47,7 @@ for your platform from the following list.
 
 \tableofcontents
 
-    Qt for X11 has some requirements that are given in more detail 
+    Qt for X11 has some requirements that are given in more detail
     in the \l{Qt for X11 Requirements} document.
 
 \section1 Step 1: Installing the License File (commercial editions only)
@@ -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:
@@ -90,7 +92,7 @@ for your platform from the following list.
     place. To do this (as root if necessary), type:
 
 \snippet doc/src/snippets/code/doc_src_installation.qdoc 3
-    
+
     Note that on some systems the make utility is named differently,
     e.g. gmake. The configure script tells you which make utility to
     use.
@@ -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.
@@ -286,7 +289,7 @@ script to uninstall the binary package. The script is located in /Developer/Tool
 must be run as root.
 
 \note Do not run the iPhone simulator while installing Qt. The
-\l{http://openradar.appspot.com/7214991} 
+\l{http://openradar.appspot.com/7214991}
 {iPhone simulator conflicts with the package installer}.
 
 \section1 Step 1: Install the License File (commercial editions only)
@@ -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
 
@@ -562,17 +567,17 @@ Qt for the Symbian platform has some requirements that are given in more detail
 in the \l{Qt for the Symbian platform Requirements} document.
 
 This document describes how to install and configure Qt for
-the Symbian platform from scratch. If you are using pre-built binaries, follow 
-the instructions given in the \l{Installing Qt for the Symbian platform from a 
+the Symbian platform from scratch. If you are using pre-built binaries, follow
+the instructions given in the \l{Installing Qt for the Symbian platform from a
 Binary Package} document.
 
 \section1 Step 1: Set Up the Development Environment
 
-    Make sure your Symbian development environment is correctly installed 
+    Make sure your Symbian development environment is correctly installed
     and patched as explained in the \l{Qt for the Symbian platform Requirements}
     document.
 
-    After you have finished the Symbian development environment setup, it is 
+    After you have finished the Symbian development environment setup, it is
     good to verify that environment is functional for example by compiling one
     of the pure Symbian examples for both emulator and HW. This can be done from
     command prompt as follows:
@@ -584,7 +589,7 @@ Binary Package} document.
 
 \section1 Step 2: Install Qt
 
-    Uncompress the \l{http://qt.nokia.com/downloads}{downloaded} source 
+    Uncompress the \l{http://qt.nokia.com/downloads}{downloaded} source
     package into the directory you want Qt installed, e.g. \c{C:\Qt\%VERSION%}.
 
     \note Qt must be installed on the same drive as the Symbian SDK you are
@@ -606,8 +611,8 @@ Binary Package} document.
     emulator. This is done by locating the Carbide.c++ submenu on the Start
     menu, and choosing "Configure environment for WINSCW command line".
 
-    If you are planning to use \c abld (the default build system that comes with 
-    the S60 SDK) to build Qt, you will also need to set the following 
+    If you are planning to use \c abld (the default build system that comes with
+    the S60 SDK) to build Qt, you will also need to set the following
     environment variable:
 
 \snippet doc/src/snippets/code/doc_src_installation.qdoc 33
@@ -620,13 +625,17 @@ Binary Package} document.
 
 \snippet doc/src/snippets/code/doc_src_installation.qdoc 23
     (to build the tools using MinGW, and the libraries using abld)
-    
+
     \bold or
 
 \snippet doc/src/snippets/code/doc_src_installation.qdoc 31
     (to build the tools using MinGW, and the libraries using SBSv2)
 
-    SBSv2 (also known as \l{http://developer.symbian.org/wiki/index.php/Introduction_to_RAPTOR} {Raptor}) 
+    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.
 
@@ -701,7 +710,7 @@ applications using Qt for Symbian can start right away.
 
 Qt for the Symbian platform has some requirements on the development
 platform. The Symbian SDK for Linux as well as a cross compiler for the ARM
-processor used on Symbian devices should be present on the development 
+processor used on Symbian devices should be present on the development
 machine.
 
 See \l{http://qt.gitorious.org/qt/pages/QtCreatorSymbianLinux} for more details.
@@ -718,7 +727,7 @@ directory you want Qt installed, e.g. \c{/home/user/qt/%VERSION%}.
 In order to build and use Qt, the \c PATH environment variable needs
 to be extended to fine Qt tools and also to find the Symbian platform tools:
 
-First you need to set the \c EPOCROOT environment variable to point to the 
+First you need to set the \c EPOCROOT environment variable to point to the
 location of your S60 SDK:
 
 \snippet doc/src/snippets/code/doc_src_installation.qdoc 36
@@ -740,6 +749,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
 
@@ -1014,13 +1026,13 @@ We hope you will enjoy using Qt.
     Qt from its source code, you will also need to install the development
     packages for these libraries for your system.
 
-    \table 100% 
+    \table 100%
     \header
     \o Name
     \o Library
     \o Notes
     \o Configuration options
-    \o Minimum working version 
+    \o Minimum working version
     \row {id="OptionalColor"}
     \o XRender
     \o libXrender
@@ -1028,13 +1040,13 @@ We hope you will enjoy using Qt.
     \o \tt{-xrender} or auto-detected
     \o 0.9.0
     \row {id="OptionalColor"}
-    \o Xrandr 
+    \o Xrandr
     \o libXrandr
     \o X Resize and Rotate Extension
     \o \tt{-xrandr} or auto-detected
     \o 1.0.2
     \row {id="OptionalColor"}
-    \o Xcursor 
+    \o Xcursor
     \o libXcursor
     \o X Cursor Extension
     \o \tt{-xcursor} or auto-detected
@@ -1046,7 +1058,7 @@ We hope you will enjoy using Qt.
     \o \tt{-xfixes} or auto-detected
     \o 3.0.0
     \row {id="OptionalColor"}
-    \o Xinerama 
+    \o Xinerama
     \o libXinerama
     \o Multi-head support
     \o \tt{-xinerama} or auto-detected
@@ -1062,7 +1074,7 @@ We hope you will enjoy using Qt.
     \o FreeType
     \o libfreetype
     \o Font engine
-    \o 
+    \o
     \o 2.1.3
 
     \row {id="DefaultColor"}
@@ -1115,7 +1127,7 @@ We hope you will enjoy using Qt.
     \o Multithreading
     \o
     \o 2.3.5
-    \endtable  
+    \endtable
 
     \note You must compile with XRender support to get alpha transparency
     support for pixmaps and images.
@@ -1199,7 +1211,7 @@ We hope you will enjoy using Qt.
             {Windows Mobile 5 Pocket PC}
         \o  \l{http://www.microsoft.com/downloads/details.aspx?familyid=DC6C00CB-738A-4B97-8910-5CD29AB5F8D9&displaylang=en}
             {Windows Mobile 5 Smartphone}
-        \o  \l{http://www.microsoft.com/downloads/details.aspx?familyid=06111A3A-A651-4745-88EF-3D48091A390B&displaylang=en }
+        \o  \l{http://www.microsoft.com/downloads/details.aspx?familyid=06111A3A-A651-4745-88EF-3D48091A390B&displaylang=en}
             {Windows Mobile 6 Professional/Standard}
     \endlist
 
@@ -1223,7 +1235,7 @@ We hope you will enjoy using Qt.
 
 	\section3 Requirements
 	\list
-		\o Development environment: 
+		\o Development environment:
 		\list
 			\o Microsoft Visual Studio 2005 (Standard Edition) or higher
 			\o ActivePerl
@@ -1368,287 +1380,297 @@ 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
-
-\section2 Qt for Windows CE only:
-   \table
-   \header \o Option  \o Description \o Note
-   \row   \o \c {-no-iwmmxt} \o Do not compile with use of IWMMXT instructions \o
-   \row   \o \c {-iwmmxt} \o Do compile with use of IWMMXT instructions. \o This is
-   for Qt for Windows CE on Arm only. This option denotes a default value and
-   needs to be evaluated. If the evaluation succeeds, the feature is included.
-   \row   \o \c {-no-crt} \o Do not add the C runtime to default deployment rules.
-   \o Default value.
-   \row   \o \c {-qt-crt} \o Qt identifies C runtime during project generation \o
-   \row   \o \c {-crt <path>} \o Specify path to C runtime used for project
-   generation. \o
-   \row   \o \c {-no-cetest} \o Do not compile Windows CE remote test application \o
-   \row   \o \c {-cetest} \o Compile Windows CE remote test application \o This
-   option denotes a default value and needs to be evaluated. If the evaluation
-   succeeds, the feature is included.
-   \row   \o \c {-signature <file>} \o Use file for signing the target project \o
-   \row   \o \c {-phonon-wince-ds9} \o Enable Phonon Direct Show 9 backend for
-   Windows CE \o Default value
-   \endtable
-	
- \section2 Qt for Symbian OS only:
-   \table
-   \header \o Option  \o Description \o Note
-   \row   \o \c {-no-freetype} \o Do not compile in Freetype2 support.
-   \o Default value.
-   \row   \o \c {-qt-freetype} \o Use the libfreetype bundled with Qt. \o
-   \row   \o \c {-fpu <flags>} \o VFP type on ARM, supported options:
-   softvfp(default) |vfpv2 | softvfp+vfpv2 \o
-   \row   \o \c {-no-s60} \o Do not compile in S60 support. \o
-   \row   \o \c {-s60} \o Compile with support for the S60 UI Framework 
-   \o Default value.
-   \row   \o \c {-no-usedeffiles} \o Disable the usage of DEF files. \o
-   \row   \o \c {-usedeffiles} \o Enable the usage of DEF files. \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
+    \header \o Option  \o Description \o Note
+    \row   \o \c {-no-iwmmxt} \o Do not compile with use of IWMMXT instructions \o
+    \row   \o \c {-iwmmxt} \o Do compile with use of IWMMXT instructions. \o This is
+    for Qt for Windows CE on Arm only. This option denotes a default value and
+    needs to be evaluated. If the evaluation succeeds, the feature is included.
+    \row   \o \c {-no-crt} \o Do not add the C runtime to default deployment rules.
+    \o Default value.
+    \row   \o \c {-qt-crt} \o Qt identifies C runtime during project generation \o
+    \row   \o \c {-crt <path>} \o Specify path to C runtime used for project
+    generation. \o
+    \row   \o \c {-no-cetest} \o Do not compile Windows CE remote test application \o
+    \row   \o \c {-cetest} \o Compile Windows CE remote test application \o This
+    option denotes a default value and needs to be evaluated. If the evaluation
+    succeeds, the feature is included.
+    \row   \o \c {-signature <file>} \o Use file for signing the target project \o
+    \row   \o \c {-phonon-wince-ds9} \o Enable Phonon Direct Show 9 backend for
+    Windows CE \o Default value
+    \endtable
+
+    \section2 Qt for Symbian OS only:
+    \table
+    \header \o Option  \o Description \o Note
+    \row   \o \c {-no-freetype} \o Do not compile in Freetype2 support.
+    \o Default value.
+    \row   \o \c {-qt-freetype} \o Use the libfreetype bundled with Qt. \o
+    \row   \o \c {-fpu <flags>} \o VFP type on ARM, supported options:
+    softvfp(default) |vfpv2 | softvfp+vfpv2 \o
+    \row   \o \c {-no-s60} \o Do not compile in S60 support. \o
+    \row   \o \c {-s60} \o Compile with support for the S60 UI Framework
+    \o Default value.
+    \row   \o \c {-no-usedeffiles} \o Disable the usage of DEF files. \o
+    \row   \o \c {-usedeffiles} \o Enable the usage of DEF files. \o
+    \endtable
 */
diff --git a/doc/src/platforms/emb-install.qdoc b/doc/src/platforms/emb-install.qdoc
index 88bbae0..32a0848 100644
--- a/doc/src/platforms/emb-install.qdoc
+++ b/doc/src/platforms/emb-install.qdoc
@@ -74,6 +74,9 @@
 
     \snippet doc/src/snippets/code/doc_src_emb-install.qdoc embedded help
 
+    The \l{Configuration Options for Qt} page gives a brief overview
+    of these.
+
     Note that by default, \l{Qt for Embedded Linux} is configured for
     installation in the \c{/usr/local/Trolltech/QtEmbedded-%VERSION%}
     directory, but this can be changed by using the \c{-prefix}
diff --git a/doc/src/platforms/platform-notes.qdoc b/doc/src/platforms/platform-notes.qdoc
index 113ad86..24b297f 100644
--- a/doc/src/platforms/platform-notes.qdoc
+++ b/doc/src/platforms/platform-notes.qdoc
@@ -630,7 +630,7 @@
     we need to do special bookkeeping in Qt to handle this correctly, which
     unfortunately make mixing in native panels hard. The best way at the moment
     to do this, is to follow the pattern below, where we post the call to the
-    function with native code rather than calling it directly. Then we now that
+    function with native code rather than calling it directly. Then we know that
     Qt has cleanly updated any pending event loop recursions before the native 
     panel is shown:
 
@@ -708,28 +708,8 @@
 
     \section1 Supported Devices
 
-    Qt is designed to work on any device which runs one of the following
-    versions of Symbian:
-
-    \table
-    \header \o Symbian Version
-    \row \o S60 3.1
-    \row \o S60 3.2
-    \row \o S60 5.0 (Symbian ^1)
-    \endtable
-
-    Qt has received \l{Tier 1 Platforms}{Tier 1} testing on the following phone models:
-
-    \table
-    \header \o Phone
-    \row    \o Nokia 5800
-    \row    \o Nokia E71
-    \row    \o Nokia E72
-    \row    \o Nokia N78
-    \row    \o Nokia N95
-    \row    \o Nokia N97
-    \row    \o Samsung i8910
-    \endtable
+    See the list of supported devices at
+    http://wiki.forum.nokia.com/index.php/Nokia_Smart_Installer_for_Symbian#Supported_Devices
 
     \section1 Supported Functionality
 
@@ -742,8 +722,6 @@
             \o Planned for future release.
     \row    \o QtDBus
             \o No current plans to support this feature.
-    \row    \o QtOpenGL ES
-            \o Planned for future release.
     \row    \o Printing support
             \o No current plans to support this feature.
     \row    \o Qt3Support
@@ -837,6 +815,12 @@
     plugin. If the Helix plugin fails to load, the MMF plugin, if present on
     the device, will be loaded instead.
 
+    \section1 QtOpenGL Support
+
+    Qt 4.7 introduces the QtOpenGL module to Symbian^3. QtOpenGL is supported on
+    devices which support OpenGL ES 2.0. Symbian platforms prior to Symbian^3
+    are not supported.
+
     \section1 UI Performance in devices prior to Symbian^3
 
     Qt uses the QPainter class to perform low-level painting on widgets and
diff --git a/doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp b/doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp
index cf40f9a..5919c01 100644
--- a/doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp
+++ b/doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp
@@ -86,38 +86,3 @@ beginMoveRows(parent, 2, 2, parent, 0);
 //! [9]
 beginMoveRows(parent, 2, 2, parent, 4);
 //! [9]
-
-
-//! [10]
-class CustomDataProxy : public QSortFilterProxyModel
-{
-    Q_OBJECT
-public:
-    CustomDataProxy(QObject *parent)
-      : QSortFilterProxyModel(parent)
-    {
-    }
-
-    ...
-
-    QVariant data(const QModelIndex &index, int role)
-    {
-        if (role != Qt::BackgroundRole)
-            return QSortFilterProxyModel::data(index, role);
-
-        if (m_customData.contains(index.row()))
-            return m_customData.value(index.row());
-        return QSortFilterProxyModel::data(index, role);
-    }
-
-private slots:
-    void resetInternalData()
-    {
-        m_customData.clear();
-    }
-
-private:
-  QHash<int, QVariant> m_customData;
-};
-//! [10]
-
diff --git a/doc/src/snippets/code/src_gui_itemviews_qidentityproxymodel.cpp b/doc/src/snippets/code/src_gui_itemviews_qidentityproxymodel.cpp
new file mode 100644
index 0000000..6bf6c89
--- /dev/null
+++ b/doc/src/snippets/code/src_gui_itemviews_qidentityproxymodel.cpp
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly <stephen.kelly@kdab.com>
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [0]
+class DateFormatProxyModel : public QIdentityProxyModel
+{
+  // ...
+
+  void setDateFormatString(const QString &formatString)
+  {
+    m_formatString = formatString;
+  }
+
+  QVariant data(const QModelIndex &index, int role)
+  {
+    if (role != Qt::DisplayRole)
+      return QIdentityProxyModel::data(index, role);
+
+    const QDateTime dateTime = sourceModel()->data(SourceClass::DateRole).toDateTime();
+
+    return dateTime.toString(m_formatString);
+  }
+
+private:
+  QString m_formatString;
+};
+//! [0]