Squashed commit of the changes from the mobile-examples repository

(4.7-generated-declarative branch).

44 files changed, 1423 insertions, 63 deletions

diff --git a/doc/doc.pri b/doc/doc.pri
index 68d729b..253e1b4 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -13,12 +13,14 @@ win32:!win32-g++* {
     unixstyle = true
 }
 
+COPYWEBKITGUIDE = $$QT_SOURCE_TREE/examples/webkit/webkit-guide
+
 $$unixstyle {
     QDOC = cd $$QT_SOURCE_TREE/tools/qdoc3/test && QT_BUILD_TREE=$$QT_BUILD_TREE QT_SOURCE_TREE=$$QT_SOURCE_TREE $$QT_BUILD_TREE/bin/qdoc3 $$DOCS_GENERATION_DEFINES
-    COPYWEBKITGUIDE = $$QT_SOURCE_TREE/examples/webkit/webkit-guide
 } else {
     QDOC = cd $$QT_SOURCE_TREE/tools/qdoc3/test && set QT_BUILD_TREE=$$QT_BUILD_TREE&& set QT_SOURCE_TREE=$$QT_SOURCE_TREE&& $$QT_BUILD_TREE/bin/qdoc3.exe $$DOCS_GENERATION_DEFINES
     QDOC = $$replace(QDOC, "/", "\\")
+    COPYWEBKITGUIDE = $$replace(COPYWEBKITGUIDE, "/", "\\")
 }
 ADP_DOCS_QDOCCONF_FILE = qt-build-docs-online.qdocconf
 QT_DOCUMENTATION = ($$QDOC qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \
diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc
index 93571bd..8367c0f 100644
--- a/doc/src/declarative/declarativeui.qdoc
+++ b/doc/src/declarative/declarativeui.qdoc
@@ -147,4 +147,12 @@ examples for porting}
 \list
 \o \l{Qt Quick Licensing Information}
 \endlist
+
+\section1 Online Examples
+
+\list
+\o Forum Nokia:
+\l{http://wiki.forum.nokia.com/index.php/Qt_Quick_examples_for_porting}{Qt Quick
+examples for porting}
+\endlist
 */
diff --git a/doc/src/declarative/qdeclarativemodels.qdoc b/doc/src/declarative/qdeclarativemodels.qdoc
index 23dd390..30167d7 100644
--- a/doc/src/declarative/qdeclarativemodels.qdoc
+++ b/doc/src/declarative/qdeclarativemodels.qdoc
@@ -422,3 +422,84 @@ a function in the model, e.g.:
 updated, and that \e{value} holds the new value.
 
 */
+
+/*!
+\page qml-presenting-data.html
+\title Presenting Data with QML
+
+\section1 Introduction
+
+Qt Quick contains a set of standard items that can be used to present data in a
+number of different ways. For simple user interfaces,
+\l{Using QML Positioner and Repeater Items#Repeaters}{Repeaters} can be used
+in combination with
+\l{Using QML Positioner and Repeater Items#Positioners}{Positioners}
+to obtain pieces of data and arrange them in a user interface. However, when
+large quantities of data are involved, it is often better to use models with
+the standard views since these contain many built-in display and navigation
+features.
+
+\section1 Views
+
+Views are scrolling containers for collections of items. They are feature-rich,
+supporting many of the use cases found in typical applications, and can be
+customized to meet requirements on style and behavior.
+
+A set of standard views are provided in the basic set of Qt Quick
+graphical elements:
+
+\list
+\o \l{#ListView}{ListView} arranges items in a horizontal or vertical list
+\o \l{#GridView}{GridView} arranges items in a grid within the available space
+\o \l{#PathView}{PathView} arranges items on a path
+\endlist
+
+Unlike these items, \l WebView is not a fully-featured view item, and needs
+to be combined with a \l Flickable item to create a view that performs like
+a Web browser.
+
+\section2 ListView
+
+\l ListView shows a classic list of items with horizontal or vertical placing
+of items.
+
+\beginfloatright
+\inlineimage qml-listview-snippet.png
+\endfloat
+
+The following example shows a minimal ListView displaying a sequence of
+numbers (using an \l{QML Data Models#An Integer}{integer as a model}).
+A simple delegate is used to define an items for each piece of data in the
+model.
+
+\clearfloat
+\snippet doc/src/snippets/declarative/listview/listview-snippet.qml document
+
+
+
+\section2 GridView
+
+\l GridView displays items in a grid like an file manager's icon view.
+
+\section2 PathView
+
+\l PathView displays items on a path, where the selection remains in
+the same place and the items move around it.
+
+\section1 Decorating Views
+
+\section2 Headers and Footers
+
+\section2 Sections
+
+\section2 Navigation
+
+In traditional user interfaces, views can be scrolled using standard
+controls, such as scroll bars and arrow buttons. In some situations, it
+is also possible to drag the view directly by pressing and holding a
+mouse button while moving the cursor. In touch-based user interfaces,
+this dragging action is often complemented with a flicking action, where
+scrolling continues after the user has stopped touching the view.
+
+\section1 Further Reading
+*/
diff --git a/doc/src/declarative/qtbinding.qdoc b/doc/src/declarative/qtbinding.qdoc
index 3659caa..02d88ae 100644
--- a/doc/src/declarative/qtbinding.qdoc
+++ b/doc/src/declarative/qtbinding.qdoc
@@ -465,6 +465,10 @@ below right calls this function, passing a QVariantList and a QVariantMap, which
 converted to JavaScript array and object values, repectively:
 
 \table
+\header
+\o Type
+\o String format
+\o Example
 \row
 \o \snippet doc/src/snippets/declarative/qtbinding/variantlistmap/MyItem.qml 0
 \o \snippet doc/src/snippets/declarative/qtbinding/variantlistmap/main.cpp 0
diff --git a/doc/src/declarative/qtdeclarative.qdoc b/doc/src/declarative/qtdeclarative.qdoc
index 4a6f6a9..3930d3d 100644
--- a/doc/src/declarative/qtdeclarative.qdoc
+++ b/doc/src/declarative/qtdeclarative.qdoc
@@ -210,4 +210,4 @@
   #include <QtDeclarative> to use this function.
 
   Returns the QML type id.
-  */
+*/
diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc
index dea5aa1..65879b3 100644
--- a/doc/src/development/qmake-manual.qdoc
+++ b/doc/src/development/qmake-manual.qdoc
@@ -1719,6 +1719,9 @@
     executable. If you need to install executable files, you can unset the
     files' executable flags.
 
+    Note that \c qmake will skip files that are executable. If you need to install
+    executable files, you can unset the files' executable flags.
+
     \target LEXIMPLS
     \section1 LEXIMPLS
 
@@ -1811,6 +1814,8 @@
 
     \bold{Note:} On the Symbian platform, this variable is ignored.
 
+    \bold{Note:} On the Symbian platform, this variable is ignored.
+
     \target MAKEFILE_GENERATOR
     \section1 MAKEFILE_GENERATOR
 
diff --git a/doc/src/development/qtestlib.qdoc b/doc/src/development/qtestlib.qdoc
index 44b682a..65677be 100644
--- a/doc/src/development/qtestlib.qdoc
+++ b/doc/src/development/qtestlib.qdoc
@@ -751,8 +751,8 @@
 
     Tools for handling and visualizing test data are available as part of
     the \l {qtestlib-tools} project in the \l{Qt Labs} web site.
-	These include a tool for comparing performance data obtained from test
-	runs and a utility to generate Web-based graphs of performance data.
+    These include a tool for comparing performance data obtained from test
+    runs and a utility to generate Web-based graphs of performance data.
 
     See the \l{qtestlib-tools Announcement}{qtestlib-tools announcement}
     for more information on these tools and a simple graphing example.
diff --git a/doc/src/examples/applicationicon.qdoc b/doc/src/examples/applicationicon.qdoc
new file mode 100644
index 0000000..d03bf36
--- /dev/null
+++ b/doc/src/examples/applicationicon.qdoc
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
+**
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of this
+** file.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*! \example widgets/applicationicon
+    \group all-examples
+    \title Application Icon Example
+
+    The example shows how to add an application icon to a mobile application.
+
+    \image appicon_screenshot.png The icon on a Nokia XPressMusic 5800
+
+    \section1 Creating an icon for Maemo
+
+    Maemo expects the icon of an application to be a 64x64 PNG image file. The
+    file name of the icon should be the same as the executable with a \c .png
+    extension. You also need a \c .desktop file that gives the window manager
+    hints about the application, such as name, type and icon.
+
+    \quotefile examples/widgets/applicationicon/applicationicon.desktop
+
+    The \c Icon field should also contain the name of the executable. On the
+    device, application icons are stored in the
+    \c /usr/share/icons/hicolor/64x64/apps directory
+    and desktop files in the \c /usr/share/applications/hildon directory.
+
+    \section1 Creating an icon for Symbian
+
+    Symbian uses Scalable Vector Graphics (SVG Tiny 1.1+) to render
+    application icons in the application menu. Therefore icons could be
+    created manually with a text editor, since SVG files are plain text with
+    XML syntax, but usually you would use a vector graphics program that is
+    able to output SVG files. Popular graphics programs such as Adobe
+    Illustrator or Inkscape are able to do so.
+
+    For best results, the icon should be created on a 44x44 pixel canvas.
+    Otherwise the image might be scaled in unexpected ways.
+
+    Once you have created your icon, make sure that it is stored according to
+    the SVG-Tiny 1.1+ standard. Inkscape, for instance, is not able to save
+    images that way, but there are tools that can convert general SVG files
+    into the Tiny format. For instance, the svg2svgt tool that is bundled with
+    Symbian 3rd and 5th editon SDKs under the folder s60tools can do this
+    conversion to some extent. Another tool to convert SVG to SVG Tiny is SVG
+    Pony.
+
+    \section1 Adding the icons to the project
+
+    Edit the .pro file and specify the ICON variable for the symbian target. 
+    For Maemo, we need to add that the \c .desktop and icon file should be
+    installed.
+
+    \quotefile examples/widgets/applicationicon/applicationicon.pro
+
+    Currently, Qt Creator doesn't include the icon and desktop files in the
+    application package for Maemo, merely the executable file is included. As a
+    workaround for this, the files can be added manually in the Projects tab.
+    In the "Create Package" build step for the Maemo target, the \c .desktop
+    file and icon can be added to be a part of the package contents.
+    Unfortunately, these additions are only stored as a part of the
+    \c .pro.user file. This issue will be resolved in a future release of
+    Qt Creator.
+
+    \image appicon_packagecontents.png Manual addition of files to the "Create Package" build step
+*/
diff --git a/doc/src/examples/broadcastreceiver.qdoc b/doc/src/examples/broadcastreceiver.qdoc
index ea3c331..3d127dc 100644
--- a/doc/src/examples/broadcastreceiver.qdoc
+++ b/doc/src/examples/broadcastreceiver.qdoc
@@ -29,7 +29,7 @@
     \example network/broadcastreceiver
     \title Broadcast Receiver Example
 
-    The Broadcast Receiever example shows how to receive information that is broadcasted
+    The Broadcast Receiver example shows how to receive information that is broadcasted
     over a local network.
 
     \image broadcastreceiver-example.png
diff --git a/doc/src/examples/combowidgetmapper.qdoc b/doc/src/examples/combowidgetmapper.qdoc
index 897d135..e305052 100644
--- a/doc/src/examples/combowidgetmapper.qdoc
+++ b/doc/src/examples/combowidgetmapper.qdoc
@@ -29,7 +29,7 @@
     \example itemviews/combowidgetmapper
     \title Combo Widget Mapper Example
 
-    The Delegate Widget Mapper example shows how to use a custom delegate to
+    The Combo Widget Mapper example shows how to use a custom delegate to
     map information from a model to specific widgets on a form.
 
     \image combowidgetmapper-example.png
diff --git a/doc/src/examples/cube.qdoc b/doc/src/examples/cube.qdoc
new file mode 100644
index 0000000..0603941
--- /dev/null
+++ b/doc/src/examples/cube.qdoc
@@ -0,0 +1,178 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example opengl/cube
+    \group all-examples
+    \title Cube OpenGL ES 2.0 example
+
+    The Cube OpenGL ES 2.0 example shows how to write mouse rotateable
+	textured 3D cube using OpenGL ES 2.0 with Qt. It shows how to handle
+	polygon geometries efficiently and how to write simple vertex and
+	fragment shader for programmable graphics pipeline. In addition it
+	shows how to use quaternions for representing 3D object orientation.
+
+    This example has been written for OpenGL ES 2.0 but it works also on
+	desktop OpenGL because this example is simple enough and for the
+	most parts desktop OpenGL API is same. It compiles also without OpenGL
+	support but then it just shows a label stating that OpenGL support is
+	required.
+
+	\image cube.png Screenshot of the Cube example running on N900
+
+	The example consist of two classes:
+
+	\list
+	\o \c MainWidget extends QGLWidget and contains OpenGL ES 2.0
+		initialization and drawing and mouse and timer event handling
+	\o \c GeometryEngine handles polygon geometries. Transfers polygon geometry
+		to vertex buffer objects and draws geometries from vertex buffer objects.
+	\endlist
+
+	We'll start by initializing OpenGL ES 2.0 in \c MainWidget.
+
+	\tableofcontents
+
+	\section1 Initializing OpenGL ES 2.0
+
+	Since OpenGL ES 2.0 doesn't support fixed graphics pipeline anymore it has to
+	be implemented by ourselves. This makes graphics pipeline very flexible but
+	in the same time it becomes more difficult because user has to implement graphics
+	pipeline to get even the simplest example running. It also makes graphics pipeline
+	more efficient because user can decide what kind of pipeline is needed for the
+	application.
+
+	First we have to implement vertex shader. It gets vertex data and
+	model-view-projection matrix (MVP) as parameters. It transforms vertex position
+	using MVP matrix to screen space and passes texture coordinate to
+	fragment shader. Texture coordinate will be automatically interpolated on polygon
+	faces.
+
+	\snippet examples/opengl/cube/vshader.glsl 0
+
+	After that we need to implement second part of the graphics pipeline - fragment
+	shader. For this exercise we need to implement fragment shader that handles
+	texturing. It gets interpolated texture coordinate as a parameter and looks up
+	fragment color from the given texture.
+
+	\snippet examples/opengl/cube/fshader.glsl 0
+
+	Using \c QGLShaderProgram we can compile, link and bind shader code to
+	graphics pipeline. This code uses Qt Resource files to access shader source code.
+
+	\snippet examples/opengl/cube/mainwidget.cpp 3
+
+	The following code enables depth buffering and back face culling.
+
+	\snippet examples/opengl/cube/mainwidget.cpp 2
+
+	\section1 Loading textures from Qt Resource files
+
+	\c QGLWidget interface implements methods for loading textures from QImage to GL
+	texture memory. We still need to use OpenGL provided functions for specifying
+	the GL texture unit and configuring texture filtering options.
+
+	\snippet examples/opengl/cube/mainwidget.cpp 4
+
+	\section1 Cube Geometry
+
+	There are many ways to render polygons in OpenGL but the most efficient way is
+	to use only triangle strip primitives and render vertices from graphics hardware
+	memory. OpenGL has a mechanism to create buffer objects to this memory area and
+	transfer vertex data to these buffers. In OpenGL terminology these are referred
+	as Vertex Buffer Objects (VBO).
+
+	\image cube_faces.png Cube faces and vertices
+
+	This is how cube faces break down to triangles. Vertices are ordered this way
+	to get vertex ordering correct using triangle strips. OpenGL determines triangle
+	front and back face based on vertex ordering. By default OpenGL uses
+	counter-clockwise order for front faces. This information is used by back face
+	culling which improves rendering performance by not rendering back faces of the
+	triangles. This way graphics pipeline can omit rendering sides of the triangle that
+	aren't facing towards screen.
+
+	Creating vertex buffer objects and transferring data to them is quite simple using
+	OpenGL provided functions.
+
+	\snippet examples/opengl/cube/geometryengine.cpp 0
+
+	\snippet examples/opengl/cube/geometryengine.cpp 1
+
+	Drawing primitives from VBOs and telling programmable graphics pipeline how to
+	locate vertex data requires few steps. First we need to bind VBOs to be used.
+	After that we bind shader program attribute names and configure what
+	kind of data it has in the bound VBO. Finally we'll draw triangle
+	strip primitives using indices from the other VBO.
+
+	\snippet examples/opengl/cube/geometryengine.cpp 2
+
+	\section1 Perspective projection
+
+	Using \c QMatrix4x4 helper methods it's really easy to calculate perpective
+	projection matrix. This matrix is used to project vertices to screen space.
+
+	\snippet examples/opengl/cube/mainwidget.cpp 5
+
+	\section1 Orientation of the 3D object
+
+	Quaternions are handy way to represent orientation of the 3D object. Quaternions
+	involve quite complex mathematics but fortunately all the necessary mathematics
+	behind quaternions is implemented in \c QQuaternion. That allows us to store
+	cube orientation in quaternion and rotating cube around given axis is quite
+	simple.
+
+	The following code calculates rotation axis and angular speed based on mouse events.
+
+	\snippet examples/opengl/cube/mainwidget.cpp 0
+
+	\c QBasicTimer is used to animate scene and update cube orientation. Rotations
+	can be concatenated simply by multiplying quaternions.
+
+	\snippet examples/opengl/cube/mainwidget.cpp 1
+
+	Model-view matrix is calculated using the quaternion and by moving world by Z axis.
+	This matrix is multiplied with the projection matrix to get MVP matrix for shader
+	program.
+
+	\snippet examples/opengl/cube/mainwidget.cpp 6
+
+*/
diff --git a/doc/src/examples/dragdroprobot.qdoc b/doc/src/examples/dragdroprobot.qdoc
index bcf0fe7..0a09314 100644
--- a/doc/src/examples/dragdroprobot.qdoc
+++ b/doc/src/examples/dragdroprobot.qdoc
@@ -29,7 +29,7 @@
     \example graphicsview/dragdroprobot
     \title Drag and Drop Robot Example
 
-    This GraphicsView example shows how to implement Drag and Drop in a
+    The Drag and Drop Robot example shows how to implement Drag and Drop in a
     QGraphicsItem subclass, as well as how to animate items using Qt's
     \l{Animation Framework}.
 
diff --git a/doc/src/examples/elasticnodes.qdoc b/doc/src/examples/elasticnodes.qdoc
index bba6d90..8526d55 100644
--- a/doc/src/examples/elasticnodes.qdoc
+++ b/doc/src/examples/elasticnodes.qdoc
@@ -29,7 +29,7 @@
     \example graphicsview/elasticnodes
     \title Elastic Nodes Example
 
-    This GraphicsView example shows how to implement edges between nodes in a
+    The Elastic Nodes example shows how to implement edges between nodes in a
     graph, with basic interaction. You can click to drag a node around, and
     zoom in and out using the mouse wheel or the keyboard. Hitting the space
     bar will randomize the nodes. The example is also resolution independent;
diff --git a/doc/src/examples/elidedlabel.qdoc b/doc/src/examples/elidedlabel.qdoc
new file mode 100644
index 0000000..4c6e8e8
--- /dev/null
+++ b/doc/src/examples/elidedlabel.qdoc
@@ -0,0 +1,162 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
+**
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of this
+** file.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example widgets/elidedlabel
+    \group all-examples
+    \title Elided Label Example
+
+    This example creates a widget similar to QLabel, that elides the last
+    visible line, if the text is too long to fit the widget's geometry.
+
+    \image elidedlabel-example.png Elided Label example on XPressMusic 5800
+
+    When text of varying length has to be displayed in a uniformly sized
+    area, for instance within a list or grid view where all list items have the
+    same size, it can be useful to give the user a visual clue when not all
+    text is visible. QLabel can elide text that doesn't fit within it, but only
+    in one line. The \c ElidedLabel widget shown in this example word wraps its
+    text by its width, and elides the last visible line if some text is left
+    out. \c TestWidget gives control to the features of \c ElidedWidget and
+    forms the example application.
+
+
+    \section1 ElidedLabel Class Definition
+
+    Like QLabel, \c ElidedLabel inherits from QFrame. Here's the definition of
+    the \c ElidedLabel class:
+
+
+    \snippet examples/widgets/elidedlabel/elidedlabel.h 0
+
+    The \c isElided property depends the font, text content and geometry of the
+    widget. Whenever any of these change, the \c elisionChanged() signal might
+    trigger. We cache the current elision value in \c elided, so that it
+    doesn't have to be recomputed every time it's asked for.
+
+
+    \section1 ElidedLabel Class Implementation
+
+    Except for initializing the member variables, the constructor sets the size
+    policy to be horizontally expanding, since it's meant to fill the width of
+    its container and grow vertically.
+
+    \snippet examples/widgets/elidedlabel/elidedlabel.cpp 0
+
+    Changing the \c content require a repaint of the widget.
+
+    \snippet examples/widgets/elidedlabel/elidedlabel.cpp 1
+
+    QTextLayout is used in the \c paintEvent() to divide the \c content into
+    lines, that wrap on word boundaries. Each line, except the last visible
+    one, is drawn \c lineSpacing pixels below the previous one. The \c draw()
+    method of QTextLine will draw the line using the coordinate point as the
+    top left corner.
+
+    \snippet examples/widgets/elidedlabel/elidedlabel.cpp 2
+
+    Unfortunately, QTextLayout does not elide text, so the last visible line
+    has to be treated differently. This last line is elided if it is too wide.
+    The \c drawText() method of QPainter draws the text starting from the base
+    line, which is \c ascecnt() pixels below the last drawn line.
+
+    Finally, one more line is created to see if everything fit on this line.
+
+    \snippet examples/widgets/elidedlabel/elidedlabel.cpp 3
+
+    If the text was elided and wasn't before or vice versa, cache it in
+    \c elided and emit the change.
+
+    \snippet examples/widgets/elidedlabel/elidedlabel.cpp 4
+
+
+    \section1 TestWidget Class Definition
+
+    \c TestWidget is a QWidget and is the main window of the example. It
+    contains an \c ElidedLabel which can be resized with two QSlider widgets.
+
+    \snippet examples/widgets/elidedlabel/testwidget.h 0
+
+    \section1 TestWidget Class Implementation
+
+    The constructor initializes the whole widget. Strings of different length
+    are stored in \c textSamples. The user is able to switch between these.
+
+    \snippet examples/widgets/elidedlabel/testwidget.cpp 0
+
+    An \c ElidedLabel is created to contain the first of the sample strings.
+    The frame is made visible to make it easier to see the actual size of the
+    widget.
+
+    \snippet examples/widgets/elidedlabel/testwidget.cpp 1
+
+    The buttons and the elision label are created. By connecting the
+    \c elisionChanged() signal to the \c setVisible() slot of the \c label,
+    it will act as an indicator to when the text is elided or not. This signal
+    could, for instance, be used to make a "More" button visible, or similar.
+
+    \snippet examples/widgets/elidedlabel/testwidget.cpp 2
+
+    The \c widthSlider and \c heightSlider specify the size of the
+    \c elidedText. Since the y-axis is inverted, the \c heightSlider has to be
+    inverted to act appropriately.
+
+    \snippet examples/widgets/elidedlabel/testwidget.cpp 3
+
+    The components are all stored in a QGridLayout, which is made the layout of
+    the \c TestWidget.
+
+    \snippet examples/widgets/elidedlabel/testwidget.cpp 4
+
+    On the Maemo platform, windows are stuck in landscape mode by default. With
+    this attribute set, the window manager is aware that this window can be
+    rotated.
+
+    \snippet examples/widgets/elidedlabel/testwidget.cpp 5
+
+    The \c widthSlider and \c heightSlider have the exact same length as the
+    dimensions of the \c elidedText. The maximum value for both of them is
+    thus their lengths, and each tick indicates one pixel.
+
+    \snippet examples/widgets/elidedlabel/testwidget.cpp 6
+
+    The \c switchText() slot simply cycles through all the available sample
+    texts.
+
+    \snippet examples/widgets/elidedlabel/testwidget.cpp 7
+
+    These slots set the width and height of the \c elided text, in response to
+    changes in the sliders.
+
+    \section1 The \c main() Function
+
+    The \c main() function creates an instance of \c TestWidget fullscreen and
+    enters the message loop.
+
+    \snippet examples/widgets/elidedlabel/main.cpp 0
+*/
+
diff --git a/doc/src/examples/ftp.qdoc b/doc/src/examples/ftp.qdoc
index 4fa2cfd..841d298 100644
--- a/doc/src/examples/ftp.qdoc
+++ b/doc/src/examples/ftp.qdoc
@@ -131,7 +131,9 @@
 
     \snippet examples/network/qftp/ftpwindow.cpp 5
 
-    QFtp supports canceling the download of files.
+    QFtp supports canceling the download of files. We make sure that
+    any file that is currently being written to is closed and removed,
+    and tidy up by deleting the file object.
 
     \snippet examples/network/qftp/ftpwindow.cpp 6
 
diff --git a/doc/src/examples/maemovibration.qdoc b/doc/src/examples/maemovibration.qdoc
new file mode 100644
index 0000000..ace84e0
--- /dev/null
+++ b/doc/src/examples/maemovibration.qdoc
@@ -0,0 +1,164 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
+**
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of this
+** file.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example widgets/maemovibration
+    \group all-examples
+    \title Maemo Vibration Example
+
+    The Maemo Vibration example shows how to tell the Maemo Mode Control Entity
+    (MCE) to vibrate a maemo device.
+
+    The MCE is a system service on Maemo that, among other things, provides an
+    D-Bus interface to trigger vibrations. The vibrations are specified as
+    patterns and are defined in a system configuration file.
+
+    The example program reads the configuration file to look for possible
+    vibration patterns and display a button for each. Pressing a button will
+    make the device vibrate accordingly, until the application closes, or
+    another pattern is started.
+
+    \image maemovibration-example.png Screenshot of the Maemo Vibration Example
+
+    The code makes use of two classes:
+
+    \list
+    \o \c MceVibrator connects to the MCE service and can start a certain
+       vibrator pattern. It also is responsible to parse the configuration
+       file.
+
+    \o \c ButtonWidget provides a button for each pattern. Pressing the button
+       activates the pattern in question.
+    \endlist
+
+
+    \section1 MceVibrator Class Definition
+
+    \snippet examples/widgets/maemovibration/src/mcevibrator.h 0
+
+    The \c MceVibrator class inherits from QObject and provides a specialized
+    and Qt friendly interface to the MCE vibration facilty. The slot \c vibrate()
+    can be called to make the device vibrate according to a specific pattern
+    name. We will connect it to a signal of a \c ButtonWidget object later. The
+    static method \c ParsePatternNames() can be called to find out which patterns
+    are available to us.
+
+    \list
+    \o \c mceInterface is our D-Bus handle to the MCE service. We use it to
+       invoke methods on the MCE request object.
+
+    \o \c lastPatternName contains the pattern that was activated last time. We
+       have to keep track of this, because the last pattern has to be
+       deactivated before activating a new pattern.
+    \endlist
+
+
+    \section1 MceVibrator Class Implementation
+
+    To connect to the service, we initialize the D-Bus interface handle. The
+    system header \c "mce/dbus-names.h" contains definitions of the D-Bus
+    service name and request object path and interface. These are passed to the
+    constructor of the handle, and Qt will automatically establish a connection
+    to it, if it is possible.
+
+    The MCE expects us to first enable the vibrator before we can use it. This
+    is done with the call to the \c MCE_ENABLE_VIBRATOR D-Bus method.
+
+    \snippet examples/widgets/maemovibration/src/mcevibrator.cpp 0
+
+    From now on we can activate vibration patterns. Each time a vibration
+    pattern is activated, the last pattern has to be deactivated first. In the
+    vibrate slot we use the MCE interface to call the activation method.
+
+    \snippet examples/widgets/maemovibration/src/mcevibrator.cpp 1
+
+    The calls to the private method deactivate simply makes sure to deactivate
+    the last pattern used, if there was one.
+
+    \snippet examples/widgets/maemovibration/src/mcevibrator.cpp 2
+
+    Calling either the activate or deactivate MCE D-Bus method with invalid
+    pattern names are ignored.
+
+    Finally, the destructor disables the vibrator. When the destructor of the
+    MCE interface handle is called, the connection is also closed.
+
+    \snippet examples/widgets/maemovibration/src/mcevibrator.cpp 3
+
+    The MCE configuration file contains options for many different things. We
+    are only interested in one line that contains the vibration patterns. It
+    has the following format:
+
+
+    \code
+    VibratorPatterns=semicolon;separated;list;of;values
+    \endcode
+
+    The static method \c ParsePatternNames looks for this line and returns a
+    QStringList containing the values, which are the pattern names we can use.
+
+    \snippet examples/widgets/maemovibration/src/mcevibrator.cpp 4
+
+    The helper function \c checkError() saves us some code duplication. None of the
+    called methods return anything of use to us, so we're only interested in
+    getting error messages for debugging.
+
+    \snippet examples/widgets/maemovibration/src/mcevibrator.cpp 5
+
+
+    \section1 ButtonWidget Class Definition
+
+    \snippet examples/widgets/maemovibration/src/buttonwidget.h 0
+
+    The \c ButtonWidget class inherits from QWidget and provides the main user
+    interface for the application. It creates a grid of buttons, one for each
+    string in the stringlist passed to the constructor. Pressing a button emits
+    the \c clicked() signal, where the string is the text of the button that
+    was pressed.
+
+    This class is taken from the QSignalMapper documentation. The only change
+    is the number of columns in the grid from three to two, to make the button
+    labels fit.
+
+
+    \section1 ButtonWidget Class Implementation
+
+    \snippet examples/widgets/maemovibration/src/buttonwidget.cpp 0
+
+
+    \section1 \c main() Function
+
+    The main function begins with looking up the patterns available to us.
+
+    \snippet examples/widgets/maemovibration/src/main.cpp 0
+
+    Then we create one instance of both classes, and connects the
+    \c ButtonWidget's clicked signal to the \c MceVibrator's \c vibrate() slot.
+    This works, since the button texts are the same as the pattern names.
+
+    \snippet examples/widgets/maemovibration/src/main.cpp 1
+*/
diff --git a/doc/src/examples/orientation.qdoc b/doc/src/examples/orientation.qdoc
new file mode 100644
index 0000000..8b84229
--- /dev/null
+++ b/doc/src/examples/orientation.qdoc
@@ -0,0 +1,143 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
+**
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of this
+** file.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*! \example widgets/orientation
+    \group all-examples
+    \title Orientation Example
+
+    The example shows a simple way to use different UIs depending on the screen
+    orientation of a mobile device.
+
+    \image orientation-landscape.png The UI in landscape mode
+    \image orientation-portrait.png The UI in portrait mode
+
+    The screen on many mobile devices can be viewed in both portrait and
+    landscape orientation. The orientation can be swiched with the help of a
+    hardware or software trigger. Due to the often small physical screen size,
+    user interfaces has to be very simple and compact to stay usable, and
+    applications usually occupy the whole screen. Designing a user interface
+    that works equally well in both landscape and portrait mode is not always
+    possible, however, so making a different layout for each case usually pays
+    off.
+
+    The example application makes use of two different UI widgets created with
+    the Qt Designer, one for portrait and one for landscape orientation. The
+    application has a widget that contains an image and the user is able to
+    select one of three images for it to show. In addition to the two UIs, the
+    application consists of a \c MainWindow class.
+
+    \section1 Landscape UI
+
+    If the screen is in landscape mode, the user probably holds the device with
+    both hands and is ready to give full attention to the application. The
+    landscape UI looks like this:
+
+    \image orientation-landscape-ui.png The landscape UI
+
+    To the left is a QWidget called \c choiceWidget, which will show the
+    current image, and to the right are three QRadioButton instances. The
+    active radio button specifies the image to show.
+
+    \section1 Portrait UI
+
+    When the device is in portrait mode, it usually means that the user holds
+    it with one hand, and can comfortably use the thumb for small amounts of
+    input. The layout is simpler, and is focused on consuming content. The
+    portrait UI looks like this:
+
+    \image orientation-portrait-ui.png The portrait UI
+
+    Similarly, it contains a QWidget, also called \c choiceWidget, that will
+    show the current image. In contrast to the landscape UI, this one doesn't
+    provide any controls to change the image.
+
+    \section1 MainWindow Class Definition
+
+    \c MainWindow inherits from QWidget and acts as the top level widget of the
+    application.
+
+    \snippet examples/widgets/orientation/mainwindow.h 0
+
+    The \c resizeEvent() method is re-implemented, and used to check which
+    UI to show. The \c onRadioButtonClicked() slot is connected to the
+    landscape UI's radio button group and selects the current image.
+
+    \c landscapeWidget and \c portraitWidget will contain the UI layouts. Only
+    one of them is visible at a time.
+
+    \section1 MainWindow Class Implementation
+
+    In the constructor, the widgets that will hold the UIs are created and set
+    up.
+
+    \snippet examples/widgets/orientation/mainwindow.cpp 0
+
+    Since the exit buttons on the layouts are different from each other, both
+    of them have to have their \c clicked() signal connected to the \c close()
+    slot of the main widget. The first image is also made current with the call
+    to \c onRadioButtonClicked().
+
+    \snippet examples/widgets/orientation/mainwindow.cpp 1
+
+    On the Maemo platform, windows are stuck in landscape mode by default. The
+    application has to explicitly say that rotation is supported.
+
+    \snippet examples/widgets/orientation/mainwindow.cpp 2
+
+    The \c resizeEvent() is called when the main window is first created, and
+    also whenever the window has been resized. If the window is shown in
+    full screen, this is an indication that the orientation of the screen has
+    changed.
+
+    The dimensions of \c landscapeWidget is the transpose of the dimensions of
+    \c portraitWidget. When the orientation is known, both are set to the
+    (possibly transposed) size of the window. Depending on the orientation, one
+    widget is made visible and the other invisible.
+
+    \snippet examples/widgets/orientation/mainwindow.cpp 3
+
+    When the user selects one of the radio buttons in the landscape UI, the
+    current image is changed. The image is displayed by specifying the
+    background style of the choice widget. Since both \c portrait and
+    \c landscape have a \c choiceWidget of their own, the change has to be
+    reflected in both instances.
+
+    \snippet examples/widgets/orientation/mainwindow.cpp 4
+
+    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}
+    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.
+
+    \section1 The \c main() Function
+
+    The main function creates a \c MainWindow instance and shows it full
+    screen.
+    \snippet examples/widgets/orientation/main.cpp 0
+*/
diff --git a/doc/src/examples/portedasteroids.qdoc b/doc/src/examples/portedasteroids.qdoc
index ed622e6..ad34fa7 100644
--- a/doc/src/examples/portedasteroids.qdoc
+++ b/doc/src/examples/portedasteroids.qdoc
@@ -29,8 +29,9 @@
     \example graphicsview/portedasteroids
     \title Ported Asteroids Example
 
-    This GraphicsView example is a port of the
-    Asteroids game, which was based on QCanvas.
+    The Ported Asteroids example is a port of the
+    Asteroids game, which was based on QCanvas, to the Graphics View
+    framework.
  
     \image portedasteroids-example.png
 */
diff --git a/doc/src/examples/portedcanvas.qdoc b/doc/src/examples/portedcanvas.qdoc
index 3363a2d..1799673 100644
--- a/doc/src/examples/portedcanvas.qdoc
+++ b/doc/src/examples/portedcanvas.qdoc
@@ -29,8 +29,8 @@
     \example graphicsview/portedcanvas
     \title Ported Canvas Example
 
-    This GraphicsView example is a port of the old
-    QCanvas example from Qt 3.
+    The Ported Canvas example is a port of the old
+    QCanvas example from Qt 3 to the Graphics View framework.
 
     \sa {Porting to Graphics View}
 
diff --git a/doc/src/examples/recipes.qdoc b/doc/src/examples/recipes.qdoc
index f34fe3b..8e9619a 100644
--- a/doc/src/examples/recipes.qdoc
+++ b/doc/src/examples/recipes.qdoc
@@ -29,7 +29,7 @@
   \example xmlpatterns/recipes
   \title Recipes Example
 
-  The recipes example shows how to use QtXmlPatterns to query XML data
+  The Recipes example shows how to use QtXmlPatterns to query XML data
   loaded from a file. 
 
   \tableofcontents
diff --git a/doc/src/examples/rsslisting.qdoc b/doc/src/examples/rsslisting.qdoc
index ca29c04..6bef665 100644
--- a/doc/src/examples/rsslisting.qdoc
+++ b/doc/src/examples/rsslisting.qdoc
@@ -29,7 +29,7 @@
     \example xml/rsslisting
     \title RSS-Listing Example
 
-    This example shows how to create a widget that displays news items
+    The RSS-Listing example shows how to create a widget that displays news items
     from RDF news sources.
 
     \image rsslistingexample.png
diff --git a/doc/src/examples/schema.qdoc b/doc/src/examples/schema.qdoc
index 1cc4ed3..3fab7d6 100644
--- a/doc/src/examples/schema.qdoc
+++ b/doc/src/examples/schema.qdoc
@@ -29,8 +29,8 @@
   \example xmlpatterns/schema
   \title XML Schema Validation Example
 
-  This example shows how to use QtXmlPatterns to validate XML with
-  a W3C XML Schema.
+  The XML Schema Validation example shows how to use QtXmlPatterns to
+  validate XML with a W3C XML Schema.
 
   \tableofcontents
 
diff --git a/doc/src/examples/symbianvibration.qdoc b/doc/src/examples/symbianvibration.qdoc
new file mode 100644
index 0000000..a0de236
--- /dev/null
+++ b/doc/src/examples/symbianvibration.qdoc
@@ -0,0 +1,192 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
+**
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of this
+** file.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*! \example widgets/symbianvibration
+    \group all-examples
+    \title Symbian Vibration Example
+
+    The Symbian Vibrator example shows how to get fine-grained vibration
+    control on Symbian devices.
+
+    Native Symbian APIs have to be used to enable vibration, since QtMobility
+    doesn't provide an interface for it yet. It is, however, planned to be
+    included in a future release. In anticipation for that, we make use of the
+    \c XQVibra class that was a part of the Mobile Extensions Technology Preview
+    API for Qt for Symbian. The pre-compiled libraries are no longer compatible
+    with Qt 4.6, but we can include the source code itself with the project.
+
+    \image symbianvibration-example.png Screenshot of the Symbian Vibration example
+
+    The example application divides the window into rectangles, which can be
+    pressed to make the device vibrate. Pressing different rectangles make the
+    device vibrate with different intensities. Each rectangle has a different
+    color and its intensity number is drawn on top of it. Moving the cursor
+    from one rectangle to another changes the vibration intensity to that of
+    the new one.  Vibration stops when the mouse button has been released. It
+    is also possible to launch a short burst of vibration through the menu.
+
+    The example consists of four classes:
+
+    \list
+    \o \c XQVibra is the vibration interface class taken from the Mobile
+       Extensions for Qt for Symbian.
+
+    \o \c XQVibraPrivate is the Symbian specific private implementation of the
+       vibration implementation.
+
+    \o \c VibrationSurface is a custom widget that uses a XQVibra instance to
+       vibrate the device depending on where the user presses.
+
+    \o \c MainWindow inherits from QMainWindow and contains a \c VibrationSurface
+       as its central widget, and also has a menu from which it is possible to
+       make the phone vibrate.
+    \endlist
+
+    \section1 XQVibra Class Definition
+
+    The \c XQVibra class uses the pimpl-idiom to hide the platform specific
+    implementation behind a common interface. Technically it would be possible
+    to support more target platforms, with only the addition of a private
+    implementation. The rest of the code would work the same, since only the
+    common interface is used.
+
+    \snippet examples/widgets/symbianvibration/xqvibra.h 0
+
+    \c XQVibra provides a very simple interface for us to use. The interesting
+    part are the three slots \c start(), \c stop() and \c setIntensity(). Calling the start
+    method initiates vibration for the specified duration. Calling it while the
+    device is already vibrating causes it to stop the current one and start the
+    new one, even if the intensities are the same. The \c setIntensity() method
+    should be called before starting vibration.
+
+
+    \section1 VibrationSurface Class Definition
+
+    \c VibrationSurface inherits from QWidget and acts like a controller for a
+    \c XQVibra object. It responds to mouse events and performs custom painting.
+
+    \snippet examples/widgets/symbianvibration/vibrationsurface.h 0
+
+    The virtual event methods are reimplemented from QWidget. As can be seen,
+    there is no public programmable interface beyond what QWidget provides.
+
+
+    \section1 VibrationSurface Class Implementation
+
+    Mouse events control the intensity of the vibration.
+
+    \snippet examples/widgets/symbianvibration/vibrationsurface.cpp 0
+    \codeline
+    \snippet examples/widgets/symbianvibration/vibrationsurface.cpp 1
+    \codeline
+    \snippet examples/widgets/symbianvibration/vibrationsurface.cpp 2
+
+    Presses starts the vibration, movement changes the intensity and releases
+    stops the vibration. To set the right amount of vibration, the private
+    method \c applyIntensity() is used. It sets the vibration intensity according to
+    which rectangle the mouse currently resides in.
+
+    \snippet examples/widgets/symbianvibration/vibrationsurface.cpp 3
+
+    We make sure only to change the intensity if it is different than last
+    time, so that the vibrator isn't stopped and restarted unnecessarily.
+
+    The range of vibration intensity ranges from 0 to XQVibra::MaxIntensity. We
+    divide this range into a set of levels. The number of levels and the intensity
+    increase for each level are stored in two constants.
+
+    \snippet examples/widgets/symbianvibration/vibrationsurface.cpp 4
+
+    Each rectangle has an intensity of one \c IntensityPerLevel more than the
+    previous one.
+
+    \snippet examples/widgets/symbianvibration/vibrationsurface.cpp 5
+
+    The rectangles are either put in a row, if the widget's width is greater
+    than its height (landscape), otherwise they are put in a column (portrait).
+    Each rectangle's size is thus dependent on the length of the width or the
+    height of the widget, whichever is longer. The length is then divided by
+    the number of levels, which gets us either the height or the width of each
+    rectangle. The dx and dy specify the distance from one rectangle to the
+    next, which is the same as either the width or height of the rectangle.
+
+    \snippet examples/widgets/symbianvibration/vibrationsurface.cpp 6
+
+    For each level of intensity, we draw a rectangle with increasing
+    brightness.  On top of the rectangle a text label is drawn, specifying the
+    intesity of this level. We use the rectangle rect as a template for
+    drawing, and move it down or right at each iteration.
+
+    The intensity is calculated by dividing the greater of the width and height
+    into \c NumberOfLevels slices.
+
+    \snippet examples/widgets/symbianvibration/vibrationsurface.cpp 7
+
+    In case the widget's geometry is too small to fit all the levels, the user
+    interface will not work. For simplicity, we just return 0.
+
+    When we know the axis along which the rectangles lie, we can find the one
+    in which the mouse cursor lie.
+
+    \snippet examples/widgets/symbianvibration/vibrationsurface.cpp 8
+
+    The final clamp of the intensity value at the end is necessary in case the
+    mouse coordinate lies outside the widget's geometry.
+
+
+    \section1 MainWindow Class Definition
+
+    Here's the definition of the \c MainWindow class:
+
+    \snippet examples/widgets/symbianvibration/mainwindow.h 0
+
+    \c MainWindow is a top level window that uses a \c XQVibra and a
+    \c VibrationSurface. It also adds a menu option to the menu bar which can
+    start a short vibration.
+
+    \section1 MainWindow Class Implementation
+
+    In the \c MainWindow constructor the \c XQVibra and the \c VibrationSurface
+    are created. An action is added to the menu and is connected to the vibrate
+    slot.
+
+    \snippet examples/widgets/symbianvibration/mainwindow.cpp 0
+
+    The \c vibrate() slot offers a way to invoke the vibration in case no
+    mouse is present on the device.
+
+    \snippet examples/widgets/symbianvibration/mainwindow.cpp 1
+
+    \section1 Symbian Vibration Library
+
+    The \c XQVibra class requires a platform library to be included. It is
+    included in the \c .pro file for the symbian target.
+
+    \quotefromfile examples/widgets/symbianvibration/symbianvibration.pro
+    \skipto /^symbian \{/
+    \printuntil /^\}/
+*/
diff --git a/doc/src/images/appicon_packagecontents.png b/doc/src/images/appicon_packagecontents.png
new file mode 100644
index 0000000..49cb1e4
--- /dev/null
+++ b/doc/src/images/appicon_packagecontents.png
diff --git a/doc/src/images/appicon_screenshot.png b/doc/src/images/appicon_screenshot.png
new file mode 100644
index 0000000..c29dd11
--- /dev/null
+++ b/doc/src/images/appicon_screenshot.png
diff --git a/doc/src/images/cube.png b/doc/src/images/cube.png
new file mode 100644
index 0000000..95dfc98
--- /dev/null
+++ b/doc/src/images/cube.png
diff --git a/doc/src/images/cube_faces.png b/doc/src/images/cube_faces.png
new file mode 100644
index 0000000..2c7102a
--- /dev/null
+++ b/doc/src/images/cube_faces.png
diff --git a/doc/src/images/elidedlabel-example.png b/doc/src/images/elidedlabel-example.png
new file mode 100644
index 0000000..741d289
--- /dev/null
+++ b/doc/src/images/elidedlabel-example.png
diff --git a/doc/src/images/maemovibration-example.png b/doc/src/images/maemovibration-example.png
new file mode 100644
index 0000000..be975fc
--- /dev/null
+++ b/doc/src/images/maemovibration-example.png
diff --git a/doc/src/images/orientation-landscape-ui.png b/doc/src/images/orientation-landscape-ui.png
new file mode 100644
index 0000000..c591ff1
--- /dev/null
+++ b/doc/src/images/orientation-landscape-ui.png
diff --git a/doc/src/images/orientation-landscape.png b/doc/src/images/orientation-landscape.png
new file mode 100644
index 0000000..e606804
--- /dev/null
+++ b/doc/src/images/orientation-landscape.png
diff --git a/doc/src/images/orientation-portrait-ui.png b/doc/src/images/orientation-portrait-ui.png
new file mode 100644
index 0000000..304835b
--- /dev/null
+++ b/doc/src/images/orientation-portrait-ui.png
diff --git a/doc/src/images/orientation-portrait.png b/doc/src/images/orientation-portrait.png
new file mode 100644
index 0000000..3d778e8
--- /dev/null
+++ b/doc/src/images/orientation-portrait.png
diff --git a/doc/src/images/qml-listview-snippet.png b/doc/src/images/qml-listview-snippet.png
new file mode 100644
index 0000000..0ee0ffc
--- /dev/null
+++ b/doc/src/images/qml-listview-snippet.png
diff --git a/doc/src/images/symbianvibration-example.png b/doc/src/images/symbianvibration-example.png
new file mode 100644
index 0000000..21461b6
--- /dev/null
+++ b/doc/src/images/symbianvibration-example.png
diff --git a/doc/src/platforms/symbian-introduction.qdoc b/doc/src/platforms/symbian-introduction.qdoc
index 58a7e69..c033a5f 100644
--- a/doc/src/platforms/symbian-introduction.qdoc
+++ b/doc/src/platforms/symbian-introduction.qdoc
@@ -152,9 +152,9 @@
                                 when application \c .sis needs to be separately signed before
                                 including it into smart installer \c .sis.
     \row \o \c unsigned_installer_sis \o Create unsigned \l{Smart Installer}{smart installer}
-                                         \c .sis file for project.
-                                         Note: The application \c .sis contained in smart installer
-                                         \c .sis will also be unsigned.
+                                      \c .sis file for project.
+                                      Note: The application \c .sis contained in smart installer
+                                      \c .sis will also be unsigned.
     \row \o \c stub_sis      \o Create a stub sis to allow upgradability of projects
                                 that are deployed in ROM
     \endtable
diff --git a/doc/src/snippets/declarative/grid/grid-items.qml b/doc/src/snippets/declarative/grid/grid-items.qml
new file mode 100644
index 0000000..62a444d
--- /dev/null
+++ b/doc/src/snippets/declarative/grid/grid-items.qml
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Rectangle {
+    width: 112; height: 112
+    color: "#303030"
+
+    Grid {
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.verticalCenter: parent.verticalCenter
+        columns: 2
+        spacing: 6
+
+        Rectangle { color: "#aa6666"; width: 50; height: 50 }
+        Rectangle { color: "#aaaa66"; width: 50; height: 50 }
+        Rectangle { color: "#9999aa"; width: 50; height: 50 }
+        Rectangle { color: "#6666aa"; width: 50; height: 50 }
+    }
+}
diff --git a/doc/src/snippets/declarative/grid/grid-no-spacing.qml b/doc/src/snippets/declarative/grid/grid-no-spacing.qml
new file mode 100644
index 0000000..a6ca305
--- /dev/null
+++ b/doc/src/snippets/declarative/grid/grid-no-spacing.qml
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Rectangle {
+    width: 112; height: 112
+    color: "#303030"
+
+    Grid {
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.verticalCenter: parent.verticalCenter
+        columns: 2
+
+        Rectangle { color: "#aa6666"; width: 50; height: 50 }
+        Rectangle { color: "#aaaa66"; width: 50; height: 50 }
+        Rectangle { color: "#9999aa"; width: 50; height: 50 }
+        Rectangle { color: "#6666aa"; width: 50; height: 50 }
+    }
+}
diff --git a/doc/src/snippets/declarative/grid/grid-spacing.qml b/doc/src/snippets/declarative/grid/grid-spacing.qml
new file mode 100644
index 0000000..c03cdad
--- /dev/null
+++ b/doc/src/snippets/declarative/grid/grid-spacing.qml
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation 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$
+**
+****************************************************************************/
+
+//! [document]
+import QtQuick 1.0
+
+Rectangle {
+    width: 112; height: 112
+    color: "#303030"
+
+    Grid {
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.verticalCenter: parent.verticalCenter
+        columns: 2
+        spacing: 6
+
+        Rectangle { color: "#aa6666"; width: 50; height: 50 }
+        Rectangle { color: "#aaaa66"; width: 50; height: 50 }
+        Rectangle { color: "#9999aa"; width: 50; height: 50 }
+        Rectangle { color: "#6666aa"; width: 50; height: 50 }
+    }
+}
+//! [document]
diff --git a/doc/src/snippets/declarative/listview/listview-snippet.qml b/doc/src/snippets/declarative/listview/listview-snippet.qml
new file mode 100644
index 0000000..f2a260d
--- /dev/null
+++ b/doc/src/snippets/declarative/listview/listview-snippet.qml
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation 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$
+**
+****************************************************************************/
+
+//! [document]
+import QtQuick 1.0
+
+ListView {
+    width: 50; height: 200
+    model: 4
+    delegate: Text {
+        text: index;
+        font.pixelSize: 40
+    }
+}
+//! [document]
diff --git a/doc/src/snippets/declarative/mousearea/mousearea-snippet.qml b/doc/src/snippets/declarative/mousearea/mousearea-snippet.qml
index 03473ba..1b9a9ec 100644
--- a/doc/src/snippets/declarative/mousearea/mousearea-snippet.qml
+++ b/doc/src/snippets/declarative/mousearea/mousearea-snippet.qml
@@ -47,53 +47,53 @@ Rectangle {
     width: 500; height: 500
     color: "green"
 
-Column {
-//! [anchor fill]
-Rectangle {
-    id: button
-    width: 100; height: 100
+    Column {
+        //! [anchor fill]
+        Rectangle {
+            id: button
+            width: 100; height: 100
 
-    MouseArea {
-        anchors.fill: parent
-        onClicked: console.log("button clicked")
-    }
-    MouseArea {
-        width:150; height: 75
-        onClicked: console.log("irregular area clicked")
-    }
-}
-//! [anchor fill]
+            MouseArea {
+                anchors.fill: parent
+                onClicked: console.log("button clicked")
+            }
+            MouseArea {
+                width:150; height: 75
+                onClicked: console.log("irregular area clicked")
+            }
+        }
+        //! [anchor fill]
 
-Rectangle {
-    id: button
-    width: 100; height: 100
+        Rectangle {
+            id: button
+            width: 100; height: 100
 
-//! [enable handlers]
-    MouseArea {
-        hoverEnabled: true
-        acceptedButtons: Qt.LeftButton | Qt.RightButton
-        onEntered: console.log("mouse entered the area")
-        onExited: console.log("mouse left the area")
-    }
-//! [enable handlers]
-}
+        //! [enable handlers]
+            MouseArea {
+                hoverEnabled: true
+                acceptedButtons: Qt.LeftButton | Qt.RightButton
+                onEntered: console.log("mouse entered the area")
+                onExited: console.log("mouse left the area")
+            }
+        //! [enable handlers]
+        }
 
-Rectangle {
-    id: button
-    width: 100; height: 100
+        Rectangle {
+            id: button
+            width: 100; height: 100
 
-//! [mouse handlers]
-    MouseArea {
-        anchors.fill: parent
-        onClicked: console.log("area clicked")
-        onDoubleClicked: console.log("area double clicked")
-        onEntered: console.log("mouse entered the area")
-        onExited: console.log("mouse left the area")
-    }
-//! [mouse handlers]
-}
+        //! [mouse handlers]
+            MouseArea {
+                anchors.fill: parent
+                onClicked: console.log("area clicked")
+                onDoubleClicked: console.log("area double clicked")
+                onEntered: console.log("mouse entered the area")
+                onExited: console.log("mouse left the area")
+            }
+        //! [mouse handlers]
+        }
 
-} //end of column
+    } //end of column
 //! [parent end]
 }
 //! [parent end]
diff --git a/doc/src/snippets/declarative/qml-intro/images/qt-logo.svg b/doc/src/snippets/declarative/qml-intro/images/qt-logo.svg
new file mode 100644
index 0000000..8c018be
--- /dev/null
+++ b/doc/src/snippets/declarative/qml-intro/images/qt-logo.svg
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   clip-rule="evenodd"
+   stroke-miterlimit="10"
+   viewBox="0 0 174.35 209.78"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   width="744.09186"
+   height="895.29858"
+   sodipodi:docname="qt-logo.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0"
+   style="stroke-miterlimit:10">
+  <metadata
+     id="metadata29">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:window-height="668"
+     inkscape:window-width="722"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     showgrid="false"
+     inkscape:zoom="0.12195802"
+     inkscape:cx="525.6108"
+     inkscape:cy="-287.87189"
+     inkscape:window-x="476"
+     inkscape:window-y="228"
+     inkscape:current-layer="svg2" />
+  <desc
+     id="desc4">SVG generated by Lineform</desc>
+  <defs
+     id="defs6">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective31" />
+  </defs>
+  <g
+     id="g8"
+     transform="translate(-1.5304326e-4,-3.775985e-4)">
+    <path
+       d="M 43.08,0.36 C 40.94,0 38.84,-0.08 36.81,0.08 L 36.8,0.08 C 36.8,0.08 22.92,1.02 22.29,1.07 C 9.62,2.08 0,12.5 0,26.89 L 0,196.55 L 14.19,209.78 L 156.79,185.81 C 166.6,184.11 174.35,172.54 174.35,160.04 L 174.35,21.88 L 43.08,0.36"
+       id="path10"
+       style="fill:#0c481e" />
+    <path
+       d="M 174.35,160.04 C 174.35,172.54 166.6,184.11 156.79,185.82 L 14.19,209.78 L 14.19,25.99 C 14.19,9.27 27.53,-2.21 43.08,0.36 L 174.35,21.88 L 174.35,160.04"
+       id="path12"
+       style="fill:#66b036" />
+    <path
+       d="M 130.42,45.91 L 141.94,47.15 L 141.94,67.36 L 154.9,68.28 L 154.9,80.96 L 141.94,80.36 L 141.94,126.69 C 141.94,130.72 142.38,133.31 143.28,134.48 C 144.08,135.55 145.32,136.07 146.99,136.07 C 147.15,136.07 147.32,136.07 147.48,136.06 C 150.03,135.91 152.81,135.13 155.83,133.75 L 155.83,145.4 C 150.69,147.65 145.65,149 140.7,149.42 C 139.99,149.47 139.29,149.5 138.62,149.5 C 134.14,149.5 130.72,148.2 128.38,145.57 C 125.65,142.52 124.29,137.62 124.29,130.9 L 124.29,79.54 L 118.06,79.26 L 118.06,65.67 L 125.65,66.22 L 130.42,45.91"
+       id="path14"
+       style="fill:#ffffff" />
+    <path
+       d="M 154.9,80.96 L 141.94,80.36 L 141.94,80.64 L 148.88,80.96 L 154.9,80.96"
+       id="path16"
+       style="fill:#0c481e" />
+    <path
+       d="M 144.64,135.6 C 145.3,135.92 146.07,136.07 146.99,136.07 C 147.15,136.07 147.32,136.07 147.48,136.06 C 150.03,135.91 152.81,135.13 155.83,133.75 L 149.81,133.75 C 147.99,134.58 146.28,135.21 144.64,135.6"
+       id="path18"
+       style="fill:#0c481e" />
+    <path
+       d="M 128.38,145.57 C 125.65,142.52 124.29,137.62 124.29,130.9 L 124.29,79.54 L 118.06,79.26 L 118.06,65.67 L 112.05,65.67 L 112.05,68.71 C 112.92,71.98 113.6,75.53 114.11,79.35 L 118.28,79.54 L 118.28,130.9 C 118.28,137.62 119.64,142.52 122.37,145.57 C 124.71,148.2 128.13,149.5 132.61,149.5 L 138.62,149.5 C 134.14,149.5 130.72,148.2 128.38,145.57 z M 130.42,45.91 L 124.41,45.91 L 119.74,65.79 L 125.65,66.22 L 130.42,45.91"
+       id="path20"
+       style="fill:#0c481e" />
+    <path
+       d="M 91.15,132.4 C 93.5,126.36 94.66,114.49 94.66,96.79 C 94.66,80.9 93.51,69.97 91.18,63.98 C 88.84,57.95 85.35,54.69 80.66,54.28 C 80.3,54.25 79.95,54.23 79.6,54.23 C 75.26,54.23 71.92,56.77 69.59,61.86 C 67.07,67.4 65.8,78.9 65.8,96.3 C 65.8,113.11 67.04,125.05 69.54,132.05 C 71.89,138.72 75.41,142.03 80.04,142.03 C 80.25,142.03 80.45,142.02 80.66,142.01 C 85.29,141.71 88.78,138.51 91.15,132.4 M 109.13,136.15 C 105.01,145.86 98.73,152.21 90.14,155.15 C 91.01,159.6 92.32,162.6 94.06,164.17 C 95.41,165.39 97.49,165.99 100.28,165.99 C 101.09,165.99 101.96,165.94 102.87,165.84 L 102.87,178.96 L 96.91,179.75 C 95.16,179.97 93.49,180.09 91.91,180.09 C 86.69,180.09 82.47,178.82 79.29,176.26 C 75.08,172.89 71.98,166.37 69.99,156.73 C 60.86,154.78 53.73,148.97 48.8,139.23 C 43.8,129.32 41.25,114.83 41.25,95.89 C 41.25,75.46 44.74,60.38 51.6,50.81 C 57.38,42.75 65.46,38.78 75.62,38.78 C 77.24,38.78 78.93,38.88 80.66,39.08 C 92.61,40.46 101.28,46.1 106.92,55.87 C 112.46,65.43 115.17,79.14 115.17,97.13 C 115.17,113.62 113.17,126.58 109.13,136.15"
+       id="path22"
+       style="fill:#ffffff" />
+    <path
+       d="M 100.28,165.99 C 101.09,165.99 101.95,165.94 102.87,165.84 L 98.04,165.84 C 98.71,165.94 99.49,165.99 100.28,165.99"
+       id="path24"
+       style="fill:#0c481e" />
+    <path
+       d="M 84.85,63.98 C 87.19,69.97 88.34,80.9 88.34,96.79 C 88.34,114.49 87.18,126.36 84.82,132.4 C 82.93,137.28 80.3,140.31 76.96,141.48 C 77.93,141.84 78.96,142.03 80.04,142.03 C 80.25,142.03 80.45,142.02 80.66,142.01 C 85.29,141.71 88.78,138.51 91.15,132.4 C 93.5,126.36 94.66,114.49 94.66,96.79 C 94.66,80.9 93.51,69.97 91.18,63.98 C 88.84,57.95 85.35,54.69 80.66,54.28 C 80.3,54.25 79.95,54.23 79.6,54.23 C 78.51,54.23 77.48,54.39 76.52,54.72 L 76.52,54.72 C 80.12,55.83 82.89,58.93 84.85,63.98 z M 82.51,178.25 C 82.4,178.2 82.28,178.15 82.17,178.09 C 82.16,178.09 82.15,178.08 82.14,178.08 C 82.03,178.03 81.93,177.97 81.83,177.92 C 81.81,177.91 81.79,177.9 81.77,177.89 C 81.68,177.84 81.59,177.79 81.49,177.74 C 81.46,177.72 81.44,177.71 81.41,177.69 C 81.33,177.65 81.24,177.6 81.16,177.55 C 81.12,177.53 81.09,177.51 81.05,177.48 C 80.98,177.44 80.91,177.4 80.84,177.36 C 80.79,177.33 80.74,177.3 80.7,177.27 C 80.64,177.23 80.58,177.19 80.52,177.15 C 80.46,177.12 80.41,177.08 80.35,177.04 C 80.3,177.01 80.25,176.98 80.2,176.94 C 80.14,176.9 80.07,176.85 80.01,176.81 C 79.97,176.78 79.93,176.75 79.89,176.72 C 79.82,176.67 79.74,176.61 79.67,176.55 C 79.64,176.54 79.61,176.52 79.59,176.5 C 79.49,176.42 79.39,176.34 79.29,176.26 C 75.08,172.89 71.98,166.37 69.99,156.73 C 60.86,154.78 53.73,148.97 48.8,139.23 C 43.8,129.32 41.25,114.83 41.25,95.89 C 41.25,75.46 44.74,60.38 51.6,50.81 C 57.38,42.75 65.46,38.78 75.62,38.78 C 75.65,38.78 69.27,38.77 69.27,38.77 L 69.27,38.78 C 59.12,38.78 51.05,42.75 45.27,50.81 C 38.41,60.38 34.92,75.46 34.92,95.89 C 34.92,114.83 37.47,129.32 42.47,139.23 C 47.41,148.97 54.53,154.78 63.67,156.73 C 65.65,166.37 68.76,172.89 72.96,176.26 C 76.14,178.82 80.36,180.09 85.58,180.09 C 85.68,180.09 85.78,180.09 85.88,180.09 L 91.42,180.09 C 88.01,180.03 85.04,179.43 82.52,178.26 C 82.51,178.26 82.51,178.26 82.51,178.25"
+       id="path26"
+       style="fill:#0c481e" />
+  </g>
+</svg>
diff --git a/doc/src/snippets/declarative/qtbinding/properties-cpp/applicationdata.h b/doc/src/snippets/declarative/qtbinding/properties-cpp/applicationdata.h
index f317d40..763a451 100644
--- a/doc/src/snippets/declarative/qtbinding/properties-cpp/applicationdata.h
+++ b/doc/src/snippets/declarative/qtbinding/properties-cpp/applicationdata.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff --git a/doc/src/tutorials/modelview.qdoc b/doc/src/tutorials/modelview.qdoc
index efd0ff2..ed08252 100644
--- a/doc/src/tutorials/modelview.qdoc
+++ b/doc/src/tutorials/modelview.qdoc
@@ -104,7 +104,6 @@
     array of the data elements that the user can change. The table widget can be
     integrated into a program flow by reading and writing the data elements that
     the table widget provides. 
-
     This method is very intuitive and useful in many applications, but displaying 
     and editing a database table with a standard table widget can be problematic.
     Two copies of the data have to be coordinated: one outside the