Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt

Conflicts:
	examples/webkit/webkit.pro

6 files changed, 274 insertions, 169 deletions

diff --git a/doc/src/getting-started/demos.qdoc b/doc/src/getting-started/demos.qdoc
index 48a5fca..9366259 100644
--- a/doc/src/getting-started/demos.qdoc
+++ b/doc/src/getting-started/demos.qdoc
@@ -39,7 +39,7 @@
     \l{Qt Examples} and are used to highlight certain features of
     Qt.
 
-    \table 
+    \table
     \header
     \o {2,1} Getting an Overview
     \row
@@ -54,6 +54,17 @@
     If you are new to Qt, and want to start developing applications,
     you should probably start by going through the \l{Tutorials}.
 
+    \keyword qt-mobile-demos
+    \section1 Mobile Applications
+    These are demonstrations of some of the capabilities of \l{Qt Quick} and
+    \l{external: Qt Mobility Manual}{Mobility} to create feature rich mobile
+    applications.
+    \list
+    \o \l{Guitar Tuner Example}{Guitar Tuner} - a guitar tuner made with a QML frontend and a Mobility based backend
+    \o \l{Quick Hit Demo}{Quick Hit} - a game that uses multimedia and Qt Quick
+    \o \l{Qt Bubble Level Example}{Qt Bubble Level} - a game that utilizes hardware sensors for effects
+    \o \l{QCamera Example}{QCamera} - a camera application that accesses mobile contacts and networking
+    \endlist
     \section1 Painting
 
     \list
@@ -105,19 +116,19 @@
     \list
     \o \l{demos/mainwindow}{Main Window} shows Qt's extensive support for main window
        features, such as tool bars, dock windows, and menus.
-    \o \l{demos/macmainwindow}{Mac Main Window} shows how to create main window applications that has 
+    \o \l{demos/macmainwindow}{Mac Main Window} shows how to create main window applications that has
       the same appearance as other Mac OS X applications.
     \endlist
 
     \section1 Graphics View
 
     \list
-    \o \l{demos/chip}{40000 Chips} uses the \l{Graphics View Framework} to 
-       efficiently display a large number of individual graphical items on 
-       a scrolling canvas and highlighting features including rotation, 
+    \o \l{demos/chip}{40000 Chips} uses the \l{Graphics View Framework} to
+       efficiently display a large number of individual graphical items on
+       a scrolling canvas and highlighting features including rotation,
        zooming, level of detail control, and item selection.
-    \o \l{demos/embeddeddialogs}{Embedded Dialogs} showcases Qt 4.4's 
-       \e{Widgets on the Canvas} feature by embedding several 
+    \o \l{demos/embeddeddialogs}{Embedded Dialogs} showcases Qt 4.4's
+       \e{Widgets on the Canvas} feature by embedding several
        fully-functional dialogs in a scene.
     \o \l{demos/boxes}{Boxes} showcases Qt's OpenGL support and the
        integration with the \l{Graphics View Framework}.
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc
index 654eb68..b30fec3 100644
--- a/doc/src/getting-started/examples.qdoc
+++ b/doc/src/getting-started/examples.qdoc
@@ -36,7 +36,8 @@
 
    You can run the examples from the \l{Examples and Demos Launcher}
    application (except see \l{QML Examples and Demos} {QML Examples}
-   for special instructions for running those examples).
+   for special instructions for running those examples). In addition,
+   Qt Creator can directly run these examples through the Welcome Page.
 
    The examples are listed below by functional area. Each example
    listed in a particular functional area is meant to illustrate how
@@ -56,8 +57,14 @@
    These examples are provided under the terms of the
    \l{New and Modified BSD Licenses}{Modified BSD License}.
 
+   \section1 Qt Quick Example Code
+   The \l{QML Examples and Demos} site has a dedicated page for QML examples.
 
-   \section1 Examples by Functional Area
+   \section1 Qt Mobility Example Code
+   The \l{external: Qt Mobility Examples}{Qt Mobility Examples} page lists
+   examples that show how the Qt Mobility APIs might be used.
+
+   \section1 Qt Examples by Module or Technology
 
    \generatelist{related}
 */
@@ -699,6 +706,7 @@
 /*!
     \page examples-linguist.html
     \ingroup all-examples
+    \ingroup internationalization
     \title Qt Linguist Examples
     \brief Using Qt Linguist to internationalize your Qt application.
 
diff --git a/doc/src/getting-started/gettingstartedqml.qdoc b/doc/src/getting-started/gettingstartedqml.qdoc
index ccb9771..8054fc8 100644
--- a/doc/src/getting-started/gettingstartedqml.qdoc
+++ b/doc/src/getting-started/gettingstartedqml.qdoc
@@ -631,7 +631,7 @@
     Now that we have our text editor layout, we may now implement the text editor
     functionalities in C++. Using QML with C++ enables us to create our application
     logic using Qt. We can create a QML context in a C++ application using the
-    \l {Using QML in C++ Applications}{Qt's Declarative} classes and display the QML
+    \l {Using QML Bindings in C++ Applications}{Qt's Declarative} classes and display the QML
     elements using a Graphics Scene. Alternatively, we can export our C++ code into
     a plugin that the \l {QML Viewer}{qmlviewer} tool can read. For our application,
     we shall implement the load and save functions in C++ and export it as a plugin.
diff --git a/doc/src/getting-started/how-to-learn-qt.qdoc b/doc/src/getting-started/how-to-learn-qt.qdoc
index 239c8a1..8d9508b 100644
--- a/doc/src/getting-started/how-to-learn-qt.qdoc
+++ b/doc/src/getting-started/how-to-learn-qt.qdoc
@@ -51,7 +51,7 @@
     key overviews to deepen your understanding of Qt: The Qt \l{Object
     Model} and \l{Signals and Slots}.
 
-    \div{float-left}
+    \div {class="float-left"}
     \inlineimage qtdemo-small.png
     \enddiv
 
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 6d0256e..26ccf88 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -1009,78 +1009,113 @@ We hope you will enjoy using Qt.
 
     \image x11_dependencies.png Qt for X11 Dependencies
 
-    \raw HTML
-    <style type="text/css" id="colorstyles">
-     #QtGuiColor { background-color: #98fd00; color: black }
-     #QtCoreColor { background-color: #9c9cff; color: black }
-     #DefaultColor { background-color: #f6f6dc; color: black }
-     #FreetypeColor { background-color: #e6e6fa; color: black }
-     #GLColor { background-color: #ffc0cb; color: black }
-     #PthreadColor { background-color: #bdb76b; color: black }
-     #OptionalColor { background-color: #cae1ff; color: black }
-     #SMColor { background-color: #c2fafa; color: black }
-     #MiscColor { background-color: #f0f9ff; color: black }
-     #GlibColor { background-color: #b3b3b3; color: black }
-    </style>
-    \endraw
-
     The QtGui module and the QtCore module, which provides the non-GUI features required
     by QtGui, depend on the libraries described in the following table. To build
     Qt from its source code, you will also need to install the development
     packages for these libraries for your system.
 
-    \raw HTML
-    <table class="generic"> 
-    <thead><tr class="qt-style topAlign"><th>Name</th><th>Library</th><th>Notes</th><th>Configuration options</th><th>Minimum working version 
-    <tr id="OptionalColor">
-    <td> XRender </td><td> libXrender </td><td> X Rendering Extension; used for anti-aliasing</td>
-    <td><tt>-xrender</tt> or auto-detected</td><td>0.9.0</td>
-    </tr><tr id="OptionalColor">
-    <td> Xrandr </td><td> libXrandr </td><td> X Resize and Rotate Extension</td>
-    <td><tt>-xrandr</tt> or auto-detected</td><td>1.0.2</td>
-    </tr><tr id="OptionalColor">
-    <td> Xcursor </td><td> libXcursor </td><td> X Cursor Extension</td>
-    <td><tt>-xcursor</tt> or auto-detected</td><td>1.1.4</td>
-    </tr><tr id="OptionalColor">
-    <td> Xfixes </td><td> libXfixes </td><td> X Fixes Extension</td>
-    <td><tt>-xfixes</tt> or auto-detected</td><td>3.0.0</td>
-    </tr><tr id="OptionalColor">
-    <td> Xinerama </td><td> libXinerama </td><td> Multi-head support</td>
-    <td><tt>-xinerama</tt> or auto-detected</td><td>1.1.0</td>
-
-    </tr><tr id="OptionalColor">
-    <td> Fontconfig </td><td> libfontconfig </td><td> Font customization and configuration</td>
-    <td><tt>-fontconfig</tt> or auto-detected</td><td>2.1</td>
-    </tr><tr id="OptionalColor">
-    <td> FreeType </td><td> libfreetype </td><td> Font engine</td>
-    <td></td><td>2.1.3</td>
-
-    </tr><tr id="DefaultColor">
-    <td> Xi </td><td> libXi </td><td> X11 Input Extensions</td>
-    <td><tt>-xinput</tt> or auto-detected</td><td>1.3.0</td>
-    </tr><tr id="DefaultColor">
-    <td> Xt </td><td> libXt </td><td> Xt Intrinsics</td><td></td><td>0.99</td>
-    </tr><tr id="DefaultColor">
-    <td> Xext </td><td> libXext </td><td> X Extensions</td><td></td><td>6.4.3</td>
-    </tr><tr id="DefaultColor">
-    <td> X11 </td><td> libX11 </td><td> X11 Client-Side Library</td><td></td><td>6.2.1</td>
-
-    </tr><tr id="SMColor">
-    <td> SM </td><td> libSM </td><td> X Session Management</td>
-    <td><tt>-sm</tt> or auto-detected</td><td>6.0.4</td>
-    </tr><tr id="SMColor">
-    <td> ICE </td><td> libICE </td><td> Inter-Client Exchange</td>
-    <td><tt>-sm</tt> or auto-detected</td><td>6.3.5</td>
-
-    </tr><tr id="GlibColor">
-    <td> glib </td><td> libglib-2.0 </td><td> Common event loop handling</td>
-    <td><tt>-glib</tt> or auto-detected</td><td>2.8.3</td>
-    </tr><tr id="PthreadColor">
-    <td> pthread </td><td> libpthread </td><td> Multithreading</td>
-    <td></td><td>2.3.5</td>
-    </tr></th></tr></thead> 
-    </table>  
-    \endraw
+    \table 100% 
+    \header
+    \o Name
+    \o Library
+    \o Notes
+    \o Configuration options
+    \o Minimum working version 
+    \row {id="OptionalColor"}
+    \o XRender
+    \o libXrender
+    \o X Rendering Extension; used for anti-aliasing
+    \o \tt{-xrender} or auto-detected
+    \o 0.9.0
+    \row {id="OptionalColor"}
+    \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 libXcursor
+    \o X Cursor Extension
+    \o \tt{-xcursor} or auto-detected
+    \o 1.1.4
+    \row {id="OptionalColor"}
+    \o Xfixes
+    \o libXfixes
+    \o X Fixes Extension
+    \o \tt{-xfixes} or auto-detected
+    \o 3.0.0
+    \row {id="OptionalColor"}
+    \o Xinerama 
+    \o libXinerama
+    \o Multi-head support
+    \o \tt{-xinerama} or auto-detected
+    \o 1.1.0
+
+    \row {id="OptionalColor"}
+    \o Fontconfig
+    \o libfontconfig
+    \o Font customization and configuration
+    \o \tt{-fontconfig} or auto-detected
+    \o 2.1
+    \row {id="OptionalColor"}
+    \o FreeType
+    \o libfreetype
+    \o Font engine
+    \o 
+    \o 2.1.3
+
+    \row {id="DefaultColor"}
+    \o Xi
+    \o libXi
+    \o X11 Input Extensions
+    \o \tt{-xinput} or auto-detected
+    \o 1.3.0
+    \row {id="DefaultColor"}
+    \o Xt
+    \o libXt
+    \o Xt Intrinsics
+    \o
+    \o 0.99
+    \row {id="DefaultColor"}
+    \o Xext
+    \o libXext
+    \o X Extensions
+    \o
+    \o 6.4.3
+    \row {id="DefaultColor"}
+    \o X11
+    \o libX11
+    \o X11 Client-Side Library
+    \o
+    \o 6.2.1
+
+    \row {id="SMColor"}
+    \o SM
+    \o libSM
+    \o X Session Management
+    \o \tt{-sm} or auto-detected
+    \o 6.0.4
+    \row {id="SMColor"}
+    \o ICE
+    \o libICE
+    \o Inter-Client Exchange
+    \o \tt{-sm} or auto-detected
+    \o 6.3.5
+
+    \row {id="GlibColor"}
+    \o glib
+    \o libglib-2.0
+    \o Common event loop handling
+    \o \tt{-glib} or auto-detected
+    \o 2.8.3
+    \row {id="PthreadColor"}
+    \o pthread
+    \o libpthread
+    \o Multithreading
+    \o
+    \o 2.3.5
+    \endtable  
 
     \note You must compile with XRender support to get alpha transparency
     support for pixmaps and images.
@@ -1142,7 +1177,7 @@ We hope you will enjoy using Qt.
     \brief Setting up the Windows CE environment for Qt.
     \previouspage General Qt Requirements
 
-    Qt is known to work with Visual Studio 2005/2008 and the following SDKs for
+    Qt is known to work with Visual Studio 2005/2008/2010 and the following SDKs for
     Windows CE development on Windows XP and Windows Vista:
 
     \list
@@ -1180,14 +1215,37 @@ We hope you will enjoy using Qt.
             \endlist
     \endtable
 
-
     Device manufacturers may prefer to make their own customized version of
     Windows CE using Platform Builder. In order for Qt for Windows CE to
     support a custom SDK, a build specification needs to be created. More
     information on Windows CE Customization can be found
     \l{Windows CE - Working with Custom SDKs}{here}.
 
-    \sa {Known Issues}
+	\section3 Requirements
+	\list
+		\o Development environment: 
+		\list
+			\o Microsoft Visual Studio 2005 (Standard Edition) or higher
+			\o ActivePerl
+		\endlist
+		\o Footprint
+		\list
+			\o Lean configuration - 4.8 MB
+			\o Full configuration - 8.4 MB
+		\endlist
+		\o Operating Systems
+		\list
+			\o Windows CE 5 or higher
+			\o Windows Mobile 5 or higher
+		\endlist
+		\o Hardware Platform
+		\list
+			\o Supported on ARM, x86
+			\o (Compiles on SH4 and MIPS)
+		\endlist
+	\endlist
+
+		\sa {Known Issues}
 */
 
 /*!
@@ -1332,7 +1390,7 @@ We hope you will enjoy using Qt.
    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 Defualt value.
+   \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
@@ -1343,28 +1401,28 @@ We hope you will enjoy using Qt.
    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 Defualt
+   \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 Defualt
+   \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 Defualt value.
+   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 Defualt value.
+   \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 Defualt value.
+   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 Defualt value.
+   \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.
@@ -1380,14 +1438,14 @@ We hope you will enjoy using Qt.
    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 Defualt value.
+   \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 to. \o See the README file for a list of supported
+   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
@@ -1399,7 +1457,7 @@ We hope you will enjoy using Qt.
    \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 graphicssystem should
+   \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! 
@@ -1428,7 +1486,7 @@ We hope you will enjoy using Qt.
 		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 See http://www.libmng.com
+		\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.
@@ -1450,10 +1508,10 @@ We hope you will enjoy using Qt.
    \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 Defualt value.
+   \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 Defualt value.
+   "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
@@ -1464,14 +1522,14 @@ We hope you will enjoy using Qt.
    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 Defualt value.
+   \o Default value.
    \row   \o \c {-no-qmake} \o Do not compile qmake. \o
-   \row   \o \c {-qmake} \o Compile qmake. \o Defualt value
+   \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 Defualt value.
+   \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 Defualt value.
+   \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
@@ -1506,9 +1564,9 @@ We hope you will enjoy using Qt.
    \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 Defualt value.
+   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 Defualt value.
+   \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
@@ -1536,7 +1594,7 @@ We hope you will enjoy using Qt.
    \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 Defualt value.
+   \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
@@ -1547,9 +1605,9 @@ We hope you will enjoy using Qt.
    \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 Defualt value.
+   \o Default value.
    \row   \o \c {-no-mp} \o Do not use multiple processors for compiling with MSVC
-   \o Defualt value.
+   \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
@@ -1566,7 +1624,7 @@ We hope you will enjoy using Qt.
    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 Defualt value.
+   \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
@@ -1576,20 +1634,20 @@ We hope you will enjoy using Qt.
    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 Defualt value
+   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 Defualt value.
+   \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 Defualt value.
+   \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/getting-started/tutorials.qdoc b/doc/src/getting-started/tutorials.qdoc
index 5cde056..2849870 100644
--- a/doc/src/getting-started/tutorials.qdoc
+++ b/doc/src/getting-started/tutorials.qdoc
@@ -36,78 +36,106 @@
 
     \nextpage Qt Examples
 
-    A collection of tutorials and "walkthrough" guides are provided with Qt to
+    A collection of tutorials and \e walkthrough guides are provided with Qt to
     help new users get started with Qt development. These documents cover a
     range of topics, from basic use of widgets to step-by-step tutorials that
     show how an application is put together.
 
-    \table
-    \row
-    \o{2,1} \l{Widgets Tutorial}{\bold Widgets}
-    \o{2,1} \l{Address Book Tutorial}{\bold {Address Book}}
-    \row
-    \o \image widget-examples.png Widgets
-    \o
-    A beginner's guide to getting started with widgets and layouts to create
-    GUI applications.
+    For demonstrations on how to use different Qt technologies, visit the
+    \l{Qt Examples} page.
 
-    \o \image addressbook-tutorial.png AddressBook
-    \o
-    A seven part guide to creating a fully-functioning address book
-    application. This tutorial is also available with
-    \l{Tutoriel "Carnet d'adresses"}{French explanation}.
+    \section1 Qt Creator Tutorial
+    Qt Creator is the development environment for Qt.
+    \list
+    \o \l{external: Qt Creator Manual}{Qt Creator Manual} - The manual contains
+    information on how to achieve development tasks
+    These are excerpts from the manual:
+        \list
+        \o \l{external: Creating Qt Projects in Creator}{Creating Qt Projects in Creator}
+        \o \l{external: Developing Qt Quick Applications with Creator}{Developing Qt Quick Applications with Creator}
+        \o \l{external: Building and Running Applications in Creator}{Building and Running Applications in Creator}
+        \o \l{external: Debugging Applications in Creator}{Debugging Applications in Creator}
+        \o \l{external: Publishing Applications to Ovi Store}{Publishing Applications to Ovi Store}
+        \endlist
+    \endlist
 
-    \row
-    \o{2,1} \l{A Quick Start to Qt Designer}{\bold{Qt Designer}}
-    \o{2,1} \l{Qt Linguist Manual: Programmers#Tutorials}{\bold {Qt Linguist}}
-    \row
-    \o \image designer-examples.png QtDesigner
-    \o
-    A quick guide through \QD showing the basic steps to create a
-    form with this interactive tool.
+    \section1 Qt Essentials
+    The basic concepts and technologies in Qt are introduced in these essential
+    tutorials.
+        \list
+        \o \l{Getting Started Programming with Qt}{Qt Text Editor} - A simple
+        tutorial detailing the creation of a basic Qt application
+        Introduces the use of slots and signals, file operations, and widgets.
+        \o \l{Address Book Tutorial}{Address Book} - A beginner's guide to
+        widgets, container classes, and layouts. This tutorial is also available
+        with
+        \l{Tutoriel "Carnet d'adresses"}{French version}.
+        \image addressbook-tutorial.png AddressBook
+        \o \l{modelview.html}{ModelView} - This tutorial gives an introduction to
+        ModelView programming using the Qt cross-platform framework
+        \o\l{thread-basics.html}{Threads} - A short tutorial about thread concepts
+        in general and basic Qt classes to handle threads
+        \endlist
 
-    \o \image linguist-examples.png QtLinguist
-    \o
-    A guided tour through the translations process, explaining the
-    tools provided for developers, translators and release managers.
+    \section1 Qt Quick Essentials
+    Qt Quick and QML features are covered in several tutorials, ranging from
+    easy introductions to advanced tutorials that mix QML with C++ and
+    JavaScript.
+        \list
+        \o \l{QML Tutorial}{Hello World} - A very simple QML example that
+        demonstrates the basic QML features
+        \o \l{Getting Started Programming with QML}{QML Text Editor} - An
+        intermediate QML tutorial that covers many QML features such as states,
+        plugins, and C++ development
+        \o \l{QML Advanced Tutorial}{SameGame} - A walkthrough of creating a
+        simple game using QML for the interface and JavaScript for the game
+        logic
+        \image qml-samegame-demo-small.png Samegame
+        \endlist
 
+    \section1 QtWebKit
+    \list
+    \o \l{QtWebKit Guide} - An introductory guide to the features of QtWebKit
+    and HTML5.
+        \list
+        \o \l{QtWebKit Guide - Level 3 CSS}{CSS Chapter} - Covers what is
+        possible with CSS3 and QtWebKit.
+        \o \l{Canvas Graphics}{HTML5 Canvas Chapter} - Covers the basics of
+        integrating the <canvas> element into web applications.
+        \o \l{QtWebKit Guide - Client Storage}{Client Storage Chapter} -
+        Describes the basics of storing information on the client side.
+        \endlist
+    \endlist
 
-    \row
-    \o{2,1} \l{modelview.html}{\bold{ModelView}}
-    \o{2,1}
-    
-    \row
-    \o \image treeview_sml.png ModelView
-    \o This tutorial gives an introduction to ModelView programming using the Qt cross-platform framework
+    \section1 Qt Utilities
+    \list
+    \o \l{QTestLib Tutorial}{QTestLib} - This tutorial gives a short
+    introduction to how to use some of the features of Qt's unit-testing
+    framework, QTestLib. It is divided into four chapters.
+    \o \l{qmake Tutorial}{qmake} - This tutorial teaches you how to use \c
+    qmake. We recommend that you read the \l{qmake Manual}{qmake user guide}
+    after completing this tutorial.
+    \o \l{Qt Linguist Manual: Programmers#Tutorials}{Qt Linguist} - A guided
+    tour through the translations process, explaining the tools provided for
+    developers, translators and release managers.
+    \image linguist-examples.png QtLinguist
+    \endlist
 
-    \o
-    \o
-    
-    \row
-    \o{2,1} \l{QML Tutorial}{\bold QML Tutorial}
-    \o{2,1} \l{QML Advanced Tutorial}{\bold SameGame}
-    \row
-    \o{2,1}
-    This tutorial provides a very basic introduction to QML.
-    \o \image qml-samegame-demo-small.png Samegame
-    \o
-    This tutorial walks through creating a complete application with QML,
-    in this case a simple game. It is recommended that you complete the basic QML
-    tutorial first.
+    \section1 Online Learning Materials
+    These online materials provide further tutorials and developer
+    presentations.
 
-    \row
-    \o{2,1} \l{QTestLib Tutorial}{\bold QTestLib}
-    \o{2,1} \l{qmake Tutorial}{\bold qmake}
-    \row
-    \o{2,1}
-    This tutorial gives a short introduction to how to use some of the
-    features of Qt's unit-testing framework, QTestLib. It is divided into
-    four chapters.
+    \note The videos presented in these sites are not supported by the
+    Qt Creator browser and must be viewed in a web browser.
 
-    \o{2,1}
-    This tutorial teaches you how to use \c qmake. We recommend that
-    you read the \l{qmake Manual}{qmake user guide} after completing
-    this tutorial.
-
-    \endtable
+    \list
+    \o \l{Qt eLearning} - The Qt eLearning team provides training and Qt
+    certification. Many of their learning content are hosted online.
+        \list
+        \o \l{Qt eLearning Training Materials} - Additional training material
+        are available as videos, downloadable code, and PDF files.
+        \o \l{Qt Developer Days 2010} - The presentation slides and videos from
+        Qt Developer Days are available for viewing.
+        \endlist
+    \endlist
 */