Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7

37 files changed, 1965 insertions, 452 deletions

diff --git a/doc/src/declarative/basictypes.qdoc b/doc/src/declarative/basictypes.qdoc
index 8db1c35..87dab81 100644
--- a/doc/src/declarative/basictypes.qdoc
+++ b/doc/src/declarative/basictypes.qdoc
@@ -40,322 +40,377 @@
 ****************************************************************************/
 
 /*!
-  \page qdeclarativebasictypes.html
-  \title QML Basic Types
+    \page qdeclarativebasictypes.html
+    \title QML Basic Types
 
-  QML has a set of primitive types, as listed below, that are used throughout
-  the \l {QML Elements}.
+    QML has a set of primitive types, as listed below, that are used throughout
+    the \l {QML Elements}.
 
-  The simpler types in this list can also be used for defining a new
-  \c property in a component. See \l{Extending types from QML} for the
-  list of types that can be used for custom properties.
+    Some of these types can also be used for defining 
+    \c property values in QML. See \l{Extending types from QML} for the
+    list of types that can be used for \c property values.
 
-  \annotatedlist qmlbasictypes
+    \annotatedlist qmlbasictypes
 */
 
 /*!
-  \qmlbasictype int
-  \ingroup qmlbasictypes
+    \qmlbasictype int
+    \ingroup qmlbasictypes
 
-  \brief An integer is a whole number, e.g. 0, 10, or -20.  
+    \brief An integer is a whole number, e.g. 0, 10, or -20. 
 
-  An integer is a whole number, e.g. 0, 10, or -20.  The possible \c
-  int values range from around -2000000000 to around 2000000000,
-  although most elements will only accept a reduced range (which they
-  mention in their documentation).
+    An integer is a whole number, e.g. 0, 10, or -20. The possible \c
+    int values range from around -2000000000 to around 2000000000,
+    although most elements will only accept a reduced range (which they
+    mention in their documentation).
 
-  Example:
-  \qml
-  Item { width: 100; height: 200 }
-  \endqml
+    Example:
+    \qml
+    Item { width: 100; height: 200 }
+    \endqml
 
-  \sa {QML Basic Types}
+    \sa {QML Basic Types}
 */
 
 /*!
-  \qmlbasictype bool
-  \ingroup qmlbasictypes
+    \qmlbasictype bool
+    \ingroup qmlbasictypes
 
-  \brief A boolean is a binary true/false value.
+    \brief A boolean is a binary true/false value.
 
-  A boolean is a binary true/false value.
+    A boolean is a binary true/false value.
 
-  Example:
-  \qml
-  Item { focus: true; clip: false }
-  \endqml
+    Example:
+    \qml
+    Item { focus: true; clip: false }
+    \endqml
 
-  \sa {QML Basic Types}
+    \sa {QML Basic Types}
 */
 
 /*!
-  \qmlbasictype real
-  \ingroup qmlbasictypes
+    \qmlbasictype real
+    \ingroup qmlbasictypes
 
-  \brief A real number has a decimal point, e.g. 1.2 or -29.8.
+    \brief A real number has a decimal point, e.g. 1.2 or -29.8.
 
-  A real number has a decimal point, e.g. 1.2 or -29.8.
+    A real number has a decimal point, e.g. 1.2 or -29.8.
 
-  Example:
-  \qml
-  Item { width: 100.45; height: 150.82 }
-  \endqml
+    Example:
+    \qml
+    Item { width: 100.45; height: 150.82 }
+    \endqml
 
-  \note In QML all reals are stored in single precision, \l
-  {http://en.wikipedia.org/wiki/IEEE_754} {IEEE floating point}
-  format.
+    \note In QML all reals are stored in single precision, \l
+    {http://en.wikipedia.org/wiki/IEEE_754} {IEEE floating point}
+    format.
 
-  \sa {QML Basic Types}
+    \sa {QML Basic Types}
 */
 
 /*!
-  \qmlbasictype string
-  \ingroup qmlbasictypes
+    \qmlbasictype string
+    \ingroup qmlbasictypes
 
-  \brief A string is a free form text in quotes, e.g. "Hello world!".
+    \brief A string is a free form text in quotes, e.g. "Hello world!".
 
-  A string is a free form text in quotes, e.g. "Hello world!".
+    A string is a free form text in quotes, e.g. "Hello world!".
 
-  Example:
-  \qml
-  Text { text: "Hello world!" }
-  \endqml
+    Example:
+    \qml
+    Text { text: "Hello world!" }
+    \endqml
 
-  \sa {QML Basic Types}
+    \sa {QML Basic Types}
 */
 
 /*!
-  \qmlbasictype url
-  \ingroup qmlbasictypes
+    \qmlbasictype url
+    \ingroup qmlbasictypes
 
-  \brief A URL is a resource locator, like a file name. 
+    \brief A URL is a resource locator, like a file name. 
 
-  A URL is a resource locator, like a file name.  It can be either
-  absolute, e.g. "http://qt.nokia.com", or relative, e.g.
-  "pics/logo.png". A relative URL is resolved relative to the URL of
-  the component where the URL is converted from a JavaScript string
-  expression to a url property value.
+    A URL is a resource locator, like a file name. It can be either
+    absolute, e.g. "http://qt.nokia.com", or relative, e.g.
+    "pics/logo.png". A relative URL is resolved relative to the URL of
+    the component where the URL is converted from a JavaScript string
+    expression to a url property value.
 
-  Example:
-  \qml
-  Image { source: "pics/logo.png" }
-  \endqml
+    Example:
+    \qml
+    Image { source: "pics/logo.png" }
+    \endqml
 
-  \raw HTML
-  \endraw
+    \raw HTML
+    \endraw
 
-  \sa {QML Basic Types}
+    \sa {QML Basic Types}
 */
 
 /*!
-  \qmlbasictype color
-  \ingroup qmlbasictypes
-
-  \brief A color is a standard color name in quotes.
-
-  A color is a standard color name in quotes. It is normally specified
-  as an \l {http://www.w3.org/TR/SVG/types.html#ColorKeywords} {SVG
-  color name}.  These names include colors like "red", "green" and
-  "lightsteelblue".
-
-  If the color you want isn't part of this list, colors can also be
-  specified in hexidecimal triplets or quads that take the form \c
-  "#RRGGBB" and \c "#AARRGGBB" respectively.  For example, the color
-  red corresponds to a triplet of \c "#FF0000" and a slightly
-  transparent blue to a quad of \c "#800000FF".
-
-  Example:
-  \qml
-  Rectangle { color: "steelblue" }
-  Rectangle { color: "#FF0000" }
-  Rectangle { color: "#800000FF" }
-  \endqml
-
-  \sa {QML Basic Types}
+    \qmlbasictype color
+    \ingroup qmlbasictypes
+
+    \brief A color is a standard color name in quotes.
+
+    A color is a standard color name in quotes. It is normally specified
+    as an \l {http://www.w3.org/TR/SVG/types.html#ColorKeywords} {SVG
+    color name}. These names include colors like "red", "green" and
+    "lightsteelblue".
+
+    If the color you want isn't part of this list, colors can also be
+    specified in hexidecimal triplets or quads that take the form \c
+    "#RRGGBB" and \c "#AARRGGBB" respectively. For example, the color
+    red corresponds to a triplet of \c "#FF0000" and a slightly
+    transparent blue to a quad of \c "#800000FF".
+
+    Example:
+    \qml
+    Rectangle { color: "steelblue" }
+    Rectangle { color: "#FF0000" }
+    Rectangle { color: "#800000FF" }
+    \endqml
+
+    Or with the \l{Qt::rgba()}{Qt.rgba()}, \l{Qt::hsla()}{Qt.hsla()}, \l{Qt::darker()}{Qt.darker()},
+    \l{Qt::lighter()}{Qt.lighter()} or \l{Qt::tint()}{Qt.tint()} functions:
+
+    \qml
+    Rectangle { color: Qt.rgba(255, 0, 0, 1) }
+    \endqml
+
+    \sa {QML Basic Types}
 */
 
 /*!
-  \qmlbasictype point
-  \ingroup qmlbasictypes
+    \qmlbasictype point
+    \ingroup qmlbasictypes
+
+    \brief A point type has x and y attributes.
+
+    A \c point type has \c x and \c y attributes.
 
-  \brief A point is specified as "x,y".
+    To create a \c point value, specify it as a "x,y" string:
 
-  A point is specified as "x,y".
+    \qml
+    CustomObject { myPointProperty: "0,20" }
+    \endqml
 
-  Example:
-  \qml
-  Widget { pos: "0,20" }
-  \endqml
+    Or use the \l{Qt::point()}{Qt.point()} function:
 
-  \sa {QML Basic Types}
+    \qml
+    CustomObject { myPointProperty: Qt.point(0, 20) }
+    \endqml
+
+    \sa {QML Basic Types}
 */
 
 /*!
-  \qmlbasictype size
-  \ingroup qmlbasictypes
+    \qmlbasictype size
+    \ingroup qmlbasictypes
+    
+    \brief A size type has width and height attributes
+
+    A \c size type has \c width and \c height attributes.
 
-  \brief A size is specified as "width x height".
+    For example, to read the \l {Image::sourceSize} \c size property:
 
-  A size is specified as "width x height".
+    \qml
+    Column {
+        Image { id: image; source: "logo.png" }
+        Text { text: image.sourceSize.width + "," + image.sourceSize.height }
+    }
+    \endqml
 
-  Example:
-  \qml
-  Widget { size: "150x50" }
-  \endqml
+    To create a \c size value, specify it as a "width x height" string:
 
-  \sa {QML Basic Types}
+    \qml
+    LayoutItem { preferredSize: "150x50" }
+    \endqml
+
+    Or use the \l{Qt::size()}{Qt.size()} function:
+
+    \qml
+    LayoutItem { preferredSize: Qt.size(150, 50) }
+    \endqml
+
+    \sa {QML Basic Types}
 */
 
 /*!
-  \qmlbasictype rect
-  \ingroup qmlbasictypes
+    \qmlbasictype rect
+    \ingroup qmlbasictypes
+
+    \brief A rect type has x, y, width and height attributes.
+
+    A \c rect type has \c x, \c y, \c width and \c height attributes.
+
+    For example, to read the \l {Item::childrenRect.x}{Item::childrenRect} \c rect property:
+    \qml
+    Rectangle { 
+        width: childrenRect.width
+        height: childrenRect.height
 
-  \brief A rect is specified as "x, y, width x height".
+        Rectangle { width: 100; height: 100 }
+    }
+    \endqml
 
-  A rect is specified as "x, y, width x height".
+    To create a \c rect value, specify it as a "x, y, width x height" string:
 
-  Example:
-  \qml
-  Widget { geometry: "50,50,100x100" }
-  \endqml
+    \qml
+    CustomObject { myRectProperty: "50,50,100x100" }
+    \endqml
 
-  \sa {QML Basic Types}
+    Or use the \l{Qt::rect()}{Qt.rect()} function:
+
+    \qml
+    CustomObject { myRectProperty: Qt.rect(50, 50, 100, 100) }
+    \endqml
+
+    \sa {QML Basic Types}
 */
 
 /*!
-  \qmlbasictype date
-  \ingroup qmlbasictypes
+    \qmlbasictype date
+    \ingroup qmlbasictypes
+
+    \brief A date is specified as "YYYY-MM-DD".
 
-  \brief A date is specified as "YYYY-MM-DD".
+    To create a \c date value, specify it as a "YYYY-MM-DD" string:
 
-  A date is specified as "YYYY-MM-DD".
+    Example:
+    \qml
+    MyDatePicker { minDate: "2000-01-01"; maxDate: "2020-12-31" }
+    \endqml
 
-  Example:
-  \qml
-  DatePicker { minDate: "2000-01-01"; maxDate: "2020-12-31" }
-  \endqml
+    To read a date value returned from a C++ extension class, use 
+    \l{Qt::formatDate()}{Qt.formatDate()} and \l{Qt::formatDateTime()}{Qt.formatDateTime()}.
 
-  \sa {QML Basic Types}
+    \sa {QML Basic Types}
 */
 
 /*!
-  \qmlbasictype time
-  \ingroup qmlbasictypes
+    \qmlbasictype time
+    \ingroup qmlbasictypes
 
-  \brief A time is specified as "hh:mm:ss".
+    \brief A time is specified as "hh:mm:ss".
 
-  A time is specified as "hh:mm:ss".
+    A time is specified as "hh:mm:ss".
 
-  Example:
-  \qml
-  TimePicker { time: "14:22:15" }
-  \endqml
+    Example:
+    \qml
+    MyTimePicker { time: "14:22:15" }
+    \endqml
 
-  \sa {QML Basic Types}
+    To read a time value returned from a C++ extension class, use 
+    \l{Qt::formatTime()}{Qt.formatTime()} and \l{Qt::formatDateTime()}{Qt.formatDateTime()}.
+
+    \sa {QML Basic Types}
  */
 
 /*!
-  \qmlbasictype font
-  \ingroup qmlbasictypes
+    \qmlbasictype font
+    \ingroup qmlbasictypes
 
-  \brief A font type has the properties of a QFont.
+    \brief A font type has the properties of a QFont.
 
-  A font type has the properties of a QFont. The properties are:
+    A font type has the properties of a QFont. The properties are:
 
-  \list
-  \o \c string font.family
-  \o \c bool font.bold
-  \o \c bool font.italic
-  \o \c bool font.underline
-  \o \c real font.pointSize
-  \o \c int font.pixelSize
-  \endlist
+    \list
+    \o \c string font.family
+    \o \c bool font.bold
+    \o \c bool font.italic
+    \o \c bool font.underline
+    \o \c real font.pointSize
+    \o \c int font.pixelSize
+    \endlist
 
-  Example:
-  \qml
-  Text { font.family: "Helvetica"; font.pointSize: 13; font.bold: true }
-  \endqml
+    Example:
+    \qml
+    Text { font.family: "Helvetica"; font.pointSize: 13; font.bold: true }
+    \endqml
 
-  \sa {QML Basic Types}
+    \sa {QML Basic Types}
 */
 
 /*!
-  \qmlbasictype action
-  \ingroup qmlbasictypes
+    \qmlbasictype action
+    \ingroup qmlbasictypes
 
-  \brief The action type has all the properties of QAction.
+    \brief The action type has all the properties of QAction.
 
-  The action type has all the properties of QAction. The properties
-  are:
+    The action type has all the properties of QAction. The properties
+    are:
 
-  \list
-  \o \c slot action.trigger - invoke the action
-  \o \c bool action.enabled - true if the action is enabled
-  \o \c string action.text - the text associated with the action
-  \endlist
+    \list
+    \o \c slot action.trigger - invoke the action
+    \o \c bool action.enabled - true if the action is enabled
+    \o \c string action.text - the text associated with the action
+    \endlist
 
-  Actions are used like this:
+    Actions are used like this:
 
-  \qml
-  MouseArea { onClicked: MyItem.myaction.trigger() }
-  State { name: "enabled"; when: MyItem.myaction.enabled == true }
-  Text { text: MyItem.someaction.text }
-  \endqml
+    \qml
+    MouseArea { onClicked: myaction.trigger() }
+    State { name: "enabled"; when: myaction.enabled == true }
+    Text { text: someaction.text }
+    \endqml
 
-  \sa {QML Basic Types}
+    \sa {QML Basic Types}
 */
 
 /*!
-  \qmlbasictype list
-  \ingroup qmlbasictypes
-
-  \brief A list of objects.
-
-  A list of objects.  While not technically a basic type, QML also
-  supports lists of object types. When used from QML, the engine
-  automatically appends each value to the list.
-
-  For example, the \l Item class contains a list property named
-  children that can be used like this:
-
-  \qml
-  Item {
-    children: [
-      Item { id: child1 },
-      Rectangle { id: child2 },
-      Text { id: child3 }
-    ]
-  }
-  \endqml
-  \c Child1, \c Child2 and \c Child3 will all be added to the children list
-  in the order in which they appear.
-
-  \sa {QML Basic Types}
+    \qmlbasictype list
+    \ingroup qmlbasictypes
+
+    \brief A list of objects.
+
+    A list of objects. While not technically a basic type, QML also
+    supports lists of object types. When used from QML, the engine
+    automatically appends each value to the list.
+
+    For example, the \l Item class contains a list property named
+    children that can be used like this:
+
+    \qml
+    Item {
+        children: [
+            Item { id: child1 },
+            Rectangle { id: child2 },
+            Text { id: child3 }
+        ]
+    }
+    \endqml
+    \c child1, \c child2 and \c child3 will all be added to the children list
+    in the order in which they appear.
+
+    \sa {QML Basic Types}
 */
 
 /*!
-  \qmlbasictype vector3d
-  \ingroup qmlbasictypes
+    \qmlbasictype vector3d
+    \ingroup qmlbasictypes
+
+    \brief A vector3d type has x, y, and z attributes.
 
-  \brief A vector3d is specified as "x,y,z".
+    A \c vector3d type has \c x, \c y, and \c z attributes.
 
-  A vector3d is specified as "x,y,z".
+    To create a \c vector3d value, specify it as a "x,y,z" string:
 
-  \qml
-  Rotation { angle: 60; axis: "0,1,0" }
-  \endqml
+    \qml
+    Rotation { angle: 60; axis: "0,1,0" }
+    \endqml
 
-  or with the \c{Qt.vector3d()} helper function:
+    or with the \l{Qt::vector3d()}{Qt.vector3d()} function:
 
-  \qml
-  Rotation { angle: 60; axis: Qt.vector3d(0, 1, 0) }
-  \endqml
+    \qml
+    Rotation { angle: 60; axis: Qt.vector3d(0, 1, 0) }
+    \endqml
 
-  or as separate \c x, \c y, and \c z components:
+    or as separate \c x, \c y, and \c z components:
 
-  \qml
-  Rotation { angle: 60; axis.x: 0; axis.y: 1; axis.z: 0 }
-  \endqml
+    \qml
+    Rotation { angle: 60; axis.x: 0; axis.y: 1; axis.z: 0 }
+    \endqml
 
-  \sa {QML Basic Types}
+    \sa {QML Basic Types}
 */
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index 574a187..aa48bcb 100644
--- a/doc/src/declarative/elements.qdoc
+++ b/doc/src/declarative/elements.qdoc
@@ -59,8 +59,8 @@ The following table lists the QML elements provided by the \l {QtDeclarative}{Qt
 \o \l State
 \o \l PropertyChanges
 \o \l StateGroup
+\o \l StateChangeScript
 \o \l ParentChange (Item-specific)
-\o \l StateChangeScript (Item-specific)
 \o \l AnchorChanges (Item-specific)
 \endlist
 
@@ -76,6 +76,7 @@ The following table lists the QML elements provided by the \l {QtDeclarative}{Qt
 \o \l ParentAnimation
 \o \l AnchorAnimation
 \o \l SmoothedAnimation
+\o \l Vector3dAnimation
 \o \l PropertyAction
 \o \l ScriptAction
 \o \l Transition
@@ -167,8 +168,8 @@ The following table lists the QML elements provided by the \l {QtDeclarative}{Qt
 \header
 \o \bold {Views}
 \o \bold {Positioners}
-\o \bold {Media}
 \o \bold {Effects}
+\o
 
 \row
 \o
@@ -201,13 +202,6 @@ The following table lists the QML elements provided by the \l {QtDeclarative}{Qt
 
 \o
 \list
-\o \l SoundEffect
-\o \l Audio
-\o \l Video
-\endlist
-
-\o
-\list
 \o \l Particles (experimental)
     \list
     \o \l ParticleMotionLinear
@@ -217,4 +211,6 @@ The following table lists the QML elements provided by the \l {QtDeclarative}{Qt
 \endlist
 \endtable
 
+\o
+
 */
diff --git a/doc/src/declarative/globalobject.qdoc b/doc/src/declarative/globalobject.qdoc
index 7d4f9b9..3121e95 100644
--- a/doc/src/declarative/globalobject.qdoc
+++ b/doc/src/declarative/globalobject.qdoc
@@ -49,7 +49,7 @@ Contains all the properties of the JavaScript global object, plus:
 
 \section1 Qt Object
 
-The \l{qml-qt.html}{Qt object} provides useful enums and functions from Qt, for use in all QML
+The \l{Qt}{Qt object} provides useful enums and functions from Qt, for use in all QML
 files. 
 
 \section1 XMLHttpRequest
diff --git a/doc/src/declarative/pics/gridview-highlight.png b/doc/src/declarative/pics/gridview-highlight.png
new file mode 100644
index 0000000..b54af37
--- /dev/null
+++ b/doc/src/declarative/pics/gridview-highlight.png
diff --git a/doc/src/declarative/pics/gridview-simple.png b/doc/src/declarative/pics/gridview-simple.png
new file mode 100644
index 0000000..a102939
--- /dev/null
+++ b/doc/src/declarative/pics/gridview-simple.png
diff --git a/doc/src/declarative/pics/gridview.png b/doc/src/declarative/pics/gridview.png
deleted file mode 100644
index 3726893..0000000
--- a/doc/src/declarative/pics/gridview.png
+++ /dev/null
diff --git a/doc/src/declarative/pics/rect-border-width.png b/doc/src/declarative/pics/rect-border-width.png
new file mode 100644
index 0000000..c3c6c2c
--- /dev/null
+++ b/doc/src/declarative/pics/rect-border-width.png
diff --git a/doc/src/declarative/pics/repeater-modeldata.png b/doc/src/declarative/pics/repeater-modeldata.png
new file mode 100644
index 0000000..6d8df0d
--- /dev/null
+++ b/doc/src/declarative/pics/repeater-modeldata.png
diff --git a/doc/src/declarative/pics/translate.png b/doc/src/declarative/pics/translate.png
new file mode 100644
index 0000000..baf58b0
--- /dev/null
+++ b/doc/src/declarative/pics/translate.png
diff --git a/doc/src/declarative/pics/visualitemmodel.png b/doc/src/declarative/pics/visualitemmodel.png
new file mode 100644
index 0000000..5e6d132
--- /dev/null
+++ b/doc/src/declarative/pics/visualitemmodel.png
diff --git a/doc/src/declarative/qml-intro.qdoc b/doc/src/declarative/qml-intro.qdoc
index 64a4949..848e094 100644
--- a/doc/src/declarative/qml-intro.qdoc
+++ b/doc/src/declarative/qml-intro.qdoc
@@ -864,49 +864,49 @@ paused, and reaching the end of the media. They allow the developer to connect,
  some QML that will handle this event.
 
 
-\section1 Analyzing An Example: Dial
+\section1 Analyzing An Example: Dial Control
 
-In the Qt \e {examples/declarative/toys} folder you will find a folder
-\e {dial} which contains the \e dial example.
+In the Qt \e {examples/declarative/ui-components} folder you will find a folder
+\e {dialcontrol} which contains the \e dialcontrol example.
 
 \image qml-dial.png  "QML Dial example with Slider"
 
 In essence this small application has a sliding bar that you can slide using
 a mouse, and a graphical dial that responds to the position of the slider.
 
-The code for the example is in two parts: Dial.qml and dial-example.qml.
+The code for the example is in two parts: Dial.qml and dialcontrol.qml.
 
-\e {Dial.qml} can be found in the \e content sub-directory. It defines a Dial
+\e {Dial.qml} can be found in the \e content sub-directory. It defines a \c Dial
 component similar to an odometer. Eventually, the example will hook up a slider
 component so that moving the slider will change the position of a needle on the
 dial.
 
-The code for the Dial, identified by the name of the file, contains four images
+The code for the \c Dial, identified by the name of the file, contains four images
 in overlapping order: the background (numbers and divisions), the shadow of the
 needle, the needle itself, and finally the 'glass' overlay (containing
 transparent layers).
 
-The needle_shadow.png image has a Rotation assigned to the \e transform
+The \c needle_shadow.png image has a \l Rotation assigned to the \e transform
 attribute of the \l Image. The rotation is set to match the angle of the needle
 image angle value \e {needleRotation.angle}. Both the needle and the
 needle_shadow have the same default \e x and \e y values but the rotation origin
 for the needle is slightly different so that a shadow will be evident as the
 needle moves.
 
-\snippet ../../examples/declarative/toys/dial/content/Dial.qml  needle_shadow
+\snippet ../../examples/declarative/ui-components/dialcontrol/content/Dial.qml  needle_shadow
 
 And the needle
 
-\snippet ../../examples/declarative/toys/dial/content/Dial.qml  needle
+\snippet ../../examples/declarative/ui-components/dialcontrol/content/Dial.qml  needle
 
 The final image is the overlay which simply has a position defined.
 
-\snippet ../../examples/declarative/toys/dial/content/Dial.qml  overlay
+\snippet ../../examples/declarative/ui-components/dialcontrol/content/Dial.qml  overlay
 
-\e {dial-example.qml} in the \e {examples/declarative/toys/dial} directory is the
+\e {dialcontrol.qml} in the \e {examples/declarative/ui-components/dialcontrol} directory is the
 main file of the example. It defines the visual environment that the Dial
 will fit into. Because the \e Dial component and the images live in the \e
-content sub-directory we will have to import this into \e dial-example. So the
+content sub-directory we will have to import this into \e dialcontrol.qml. So the
 start of the file looks like
 
     \code
@@ -919,7 +919,7 @@ a gray color. Inside this rectangle is our component \e Dial and a \l Rectangle.
 Inside the rectangle called 'container' is another rectangle with the
 interesting name 'slider'.
 
-\snippet ../../examples/declarative/toys/dial/dial-example.qml  0
+\snippet ../../examples/declarative/ui-components/dialcontrol/dialcontrol.qml  0
 
 The Dial component, named 'dial, is \e anchored to the center of the main
 rectangle. The \c value attribute of 'dial' is set to a value based on the
diff --git a/doc/src/examples/qml-examples.qdoc b/doc/src/examples/qml-examples.qdoc
index 56ba1c7..035628e 100644
--- a/doc/src/examples/qml-examples.qdoc
+++ b/doc/src/examples/qml-examples.qdoc
@@ -110,18 +110,27 @@
 */
 
 /*!
-    \title Graphics Layouts
-    \example declarative/cppextensions/qgraphicslayouts/graphicsLayouts
+    \title LayoutItem
+    \example declarative/cppextensions/qgraphicslayouts/layoutitem
 
-    This example show how to integrate Qt \l{Graphics View Framework}{Graphics View} components
-    like QGraphicsLayoutItem, QGraphicsLinearLayout and QGraphicsGridLayout into QML.
+    This example show how to use the LayoutItem element to integrate QML items into an existing 
+    \l{Graphics View Framework}{Graphics View}-based application.
 */
 /*!
-    \title Layout Item
-    \example declarative/cppextensions/qgraphicslayouts/layoutItem
+    \title QGraphicsGridLayout
+    \example declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout
 
-    This example show how to integrate QML into an existing 
-    \l{Graphics View Framework}{Graphics View}-based application.
+    This example shows how to use QGraphicsGridLayout to lay out QML items. This is 
+    useful if you need to integrate Qt \l{Graphics View Framework}{Graphics View} layouts with
+    QML.
+*/
+/*!
+    \title QGraphicsLinearLayout
+    \example declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout
+
+    This example shows how to use QGraphicsLinearLayout to lay out QML items. This is 
+    useful if you need to integrate Qt \l{Graphics View Framework}{Graphics View} layouts with
+    QML.
 */
 /*!
     \page declarative-cppextensions-qgraphicslayouts.html
@@ -131,8 +140,9 @@
     layout components with QML:
 
     \list
-    \o \l{declarative/cppextensions/qgraphicslayouts/graphicsLayouts}{Graphics Layouts}
-    \o \l{declarative/cppextensions/qgraphicslayouts/layoutItem}{Layout Item}
+    \o \l{declarative/cppextensions/qgraphicslayouts/layoutitem}{LayoutItem}
+    \o \l{declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout}{QGraphicsGridLayout}
+    \o \l{declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout}{QGraphicsLinearLayout}
     \endlist
 */
 
diff --git a/doc/src/examples/waitconditions.qdoc b/doc/src/examples/waitconditions.qdoc
index 1d3ff84..d4f680e 100644
--- a/doc/src/examples/waitconditions.qdoc
+++ b/doc/src/examples/waitconditions.qdoc
@@ -92,7 +92,7 @@
     Together, the wait conditions, the mutex, and the \c numUsedBytes
     counter ensure that the producer is never more than \c BufferSize
     bytes ahead of the consumer, and that the consumer never reads
-    data that the consumer hasn't generated yet.
+    data that the producer hasn't generated yet.
 
     \section1 Producer Class
 
diff --git a/doc/src/howtos/openvg.qdoc b/doc/src/howtos/openvg.qdoc
index e448d9c..f4a34cd 100644
--- a/doc/src/howtos/openvg.qdoc
+++ b/doc/src/howtos/openvg.qdoc
@@ -262,7 +262,10 @@
 
     The QVG_SCISSOR_CLIP define will disable clipping with vgMask() or
     vgRenderToMask() and instead use the scissor rectangle list to perform
-    clipping.  Clipping with an arbitrary QPainterPath will not be supported.
+    clipping.  Clipping with an arbitrary QPainterPath will need to convert
+    the path into a series of rectangles.  If the number of rectangles
+    exceeds VG_MAX_SCISSOR_RECTS, then the results will not be exact.
+
     The QVG_SCISSOR_CLIP define should only be used if the OpenVG engine
     does not support vgMask() or vgRenderToMask().
 
diff --git a/doc/src/internationalization/linguist-manual.qdoc b/doc/src/internationalization/linguist-manual.qdoc
index 424dec2..4493deb 100644
--- a/doc/src/internationalization/linguist-manual.qdoc
+++ b/doc/src/internationalization/linguist-manual.qdoc
@@ -252,6 +252,9 @@
     can also process Localization Interchange File Format (XLIFF)
     format files; files in this format typically have file names that
     end with the \c .xlf suffix.
+    
+    \note The minimum supported version for XLIFF format files is 
+    1.1. XLIFF 1.0 version files are not supported.
 
     Pass the \c -help option to \c lupdate to obtain the list of
     supported options:
@@ -962,8 +965,10 @@
     application.
     \o \c .xlf \e {XLIFF files} \BR are human-readable XML files that adhere
     to the international XML Localization Interchange File Format. \QL
-    can be used to edit XLIFF files generated by other programs. For standard
-    Qt projects, however, only the TS file format is used.
+    can be used to edit XLIFF files generated by other programs. However, for 
+    standard Qt projects, only the TS file format is used.  \note The minimum 
+    supported version for XLIFF format files is 1.1. XLIFF 1.0 version files 
+    are not supported.
     \o QM \e {Qt message files} \BR are binary files that contain
     translations used by an application at run-time. These files are
     generated by \l lrelease, but can also be generated by \QL.
diff --git a/doc/src/platforms/emb-openvg.qdocinc b/doc/src/platforms/emb-openvg.qdocinc
index 579af67..877d70c 100644
--- a/doc/src/platforms/emb-openvg.qdocinc
+++ b/doc/src/platforms/emb-openvg.qdocinc
@@ -225,7 +225,9 @@ The QVG_NO_RENDER_TO_MASK define will disable the use of vgRenderToMask().
 
 The QVG_SCISSOR_CLIP define will disable clipping with vgMask() or
 vgRenderToMask() and instead use the scissor rectangle list to perform
-clipping.  Clipping with an arbitrary QPainterPath will not be supported.
+clipping.  Clipping with an arbitrary QPainterPath will need to convert
+the path into a series of rectangles.  If the number of rectangles
+exceeds VG_MAX_SCISSOR_RECTS, then the results will not be exact.
  
 The QVG_SCISSOR_CLIP define should only be used if the OpenVG engine does
 not support vgMask() or vgRenderToMask().
diff --git a/doc/src/snippets/declarative/gridview/dummydata/ContactModel.qml b/doc/src/snippets/declarative/gridview/ContactModel.qml
index 1e79030..2da4660 100644
--- a/doc/src/snippets/declarative/gridview/dummydata/ContactModel.qml
+++ b/doc/src/snippets/declarative/gridview/ContactModel.qml
@@ -39,28 +39,26 @@
 **
 ****************************************************************************/
 
+//![0]
 import Qt 4.7
 
 ListModel {
-    id: contactModel
+
     ListElement {
-        name: "Bill Smith"
-        number: "555 3264"
+        name: "Jim Williams"
         portrait: "pics/portrait.png"
     }
     ListElement {
-        name: "Jim Williams"
-        number: "555 5673"
+        name: "John Brown"
         portrait: "pics/portrait.png"
     }
     ListElement {
-        name: "John Brown"
-        number: "555 8426"
+        name: "Bill Smyth"
         portrait: "pics/portrait.png"
     }
     ListElement {
         name: "Sam Wise"
-        number: "555 0473"
         portrait: "pics/portrait.png"
     }
 }
+//![0]
diff --git a/doc/src/snippets/declarative/gridview/gridview.qml b/doc/src/snippets/declarative/gridview/gridview.qml
index 3c205bc..0b3bbf3 100644
--- a/doc/src/snippets/declarative/gridview/gridview.qml
+++ b/doc/src/snippets/declarative/gridview/gridview.qml
@@ -39,50 +39,98 @@
 **
 ****************************************************************************/
 
+//![import]
 import Qt 4.7
+//![import]
 
-//! [3]
 Rectangle {
-    width: 240; height: 180; color: "white"
-    // ContactModel model is defined in dummydata/ContactModel.qml
-    // The viewer automatically loads files in dummydata/* to assist
-    // development without a real data source.
-
-    // Define a delegate component.  A component will be
-    // instantiated for each visible item in the list.
-//! [0]
+    width: childrenRect.width; height: childrenRect.height
+
+Row {
+
+//![classdocs simple]
+GridView {
+    width: 300; height: 200
+
+    model: ContactModel {}
+    delegate: Column {
+        Image { source: portrait; anchors.horizontalCenter: parent.horizontalCenter }
+        Text { text: name; anchors.horizontalCenter: parent.horizontalCenter }
+    }
+}
+//![classdocs simple]
+
+
+//![classdocs advanced]
+Rectangle {
+    width: 300; height: 200
+
     Component {
-        id: delegate
+        id: contactDelegate
         Item {
-            id: wrapper
-            width: 80; height: 78
+            width: grid.cellWidth; height: grid.cellHeight
             Column {
+                anchors.fill: parent
                 Image { source: portrait; anchors.horizontalCenter: parent.horizontalCenter }
                 Text { text: name; anchors.horizontalCenter: parent.horizontalCenter }
             }
         }
     }
-//! [0]
-    // Define a highlight component.  Just one of these will be instantiated
-    // by each ListView and placed behind the current item.
-//! [1]
-    Component {
-        id: highlight
-        Rectangle {
-            color: "lightsteelblue"
-            radius: 5
-        }
-    }
-//! [1]
-    // The actual grid
-//! [2]
+
     GridView {
-        width: parent.width; height: parent.height
-        model: ContactModel; delegate: delegate
+        id: grid
+        anchors.fill: parent
         cellWidth: 80; cellHeight: 80
-        highlight: highlight
+
+        model: ContactModel {}
+        delegate: contactDelegate
+        highlight: Rectangle { color: "lightsteelblue"; radius: 5 }
         focus: true
     }
-//! [2]
 }
-//! [3]
+//![classdocs advanced]
+
+//![delayRemove]
+Component {
+    id: delegate
+    Item {
+        GridView.onRemove: SequentialAnimation {
+            PropertyAction { target: wrapper; property: "GridView.delayRemove"; value: true }
+            NumberAnimation { target: wrapper; property: "scale"; to: 0; duration: 250; easing.type: Easing.InOutQuad }
+            PropertyAction { target: wrapper; property: "GridView.delayRemove"; value: false }
+        }
+    }
+}
+//![delayRemove]
+
+//![highlightFollowsCurrentItem]
+Component {
+    id: highlight
+    Rectangle {
+        width: view.cellWidth; height: view.cellHeight
+        color: "lightsteelblue"; radius: 5
+        SpringFollow on x { to: view.currentItem.x; spring: 3; damping: 0.2 }
+        SpringFollow on y { to: view.currentItem.y; spring: 3; damping: 0.2 }
+    }
+}
+
+GridView {
+    id: view
+    width: 300; height: 200
+    cellWidth: 80; cellHeight: 80
+
+    model: ContactModel {}
+    delegate: Column {
+        Image { source: portrait; anchors.horizontalCenter: parent.horizontalCenter }
+        Text { text: name; anchors.horizontalCenter: parent.horizontalCenter }
+    }
+
+    highlight: highlight
+    highlightFollowsCurrentItem: false
+    focus: true
+}
+//![highlightFollowsCurrentItem]
+
+}
+
+}
diff --git a/doc/src/snippets/declarative/listview/highlight.qml b/doc/src/snippets/declarative/listview/highlight.qml
deleted file mode 100644
index af9e95f..0000000
--- a/doc/src/snippets/declarative/listview/highlight.qml
+++ /dev/null
@@ -1,104 +0,0 @@
-/****************************************************************************
-**
-** 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 QtDeclarative module 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$
-**
-****************************************************************************/
-
-import Qt 4.7
-
-Rectangle {
-    width: 180; height: 200; color: "white"
-
-    // ContactModel model is defined in dummydata/ContactModel.qml
-    // The viewer automatically loads files in dummydata/* to assist
-    // development without a real data source.
-
-    // Define a delegate component.  A component will be
-    // instantiated for each visible item in the list.
-//! [0]
-    Component {
-        id: delegate
-        Item {
-            id: wrapper
-            width: 180; height: 40
-            Column {
-                x: 5; y: 5
-                Text { text: '<b>Name:</b> ' + name }
-                Text { text: '<b>Number:</b> ' + number }
-            }
-            // Use the ListView.isCurrentItem attached property to
-            // indent the item if it is the current item.
-            states: [
-                State {
-                    name: "Current"
-                    when: wrapper.ListView.isCurrentItem
-                    PropertyChanges { target: wrapper; x: 10 }
-                }
-            ]
-            transitions: [
-                Transition { NumberAnimation { properties: "x"; duration: 200 } }
-            ]
-        }
-    }
-//! [0]
-    // Specify a highlight with custom movement.  Note that autoHighlight
-    // is set to false in the ListView so that we can control how the
-    // highlight moves to the current item.
-//! [1]
-    Component {
-        id: highlight
-        Rectangle {
-            width: 180; height: 40
-            color: "lightsteelblue"; radius: 5
-            SpringFollow on y {
-                to: list.currentItem.y
-                spring: 3
-                damping: 0.2
-            }
-        }
-    }
-    ListView {
-        id: list
-        width: parent.height; height: parent.height
-        model: ContactModel; delegate: delegate
-        highlight: highlight
-        highlightFollowsCurrentItem: false
-        focus: true
-    }
-//! [1]
-}
diff --git a/doc/src/snippets/declarative/mousearea.qml b/doc/src/snippets/declarative/mousearea.qml
new file mode 100644
index 0000000..c6071c7
--- /dev/null
+++ b/doc/src/snippets/declarative/mousearea.qml
@@ -0,0 +1,119 @@
+/****************************************************************************
+**
+** 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 QtDeclarative module 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$
+**
+****************************************************************************/
+
+//! [import]
+import Qt 4.7
+//! [import]
+
+Rectangle {
+    width: childrenRect.width
+    height: childrenRect.height
+
+Row {
+
+//! [intro]
+Rectangle { 
+    width: 100; height: 100
+    color: "green"
+
+    MouseArea { 
+        anchors.fill: parent
+        onClicked: { parent.color = 'red' }
+    }
+}
+//! [intro]
+
+//! [intro-extended]
+Rectangle {
+    width: 100; height: 100
+    color: "green"
+
+    MouseArea {
+        anchors.fill: parent
+        acceptedButtons: Qt.LeftButton | Qt.RightButton
+        onClicked: {
+            if (mouse.button == Qt.RightButton)
+                parent.color = 'blue';
+            else
+                parent.color = 'red';
+        }
+    }
+}
+//! [intro-extended]
+
+//! [drag]
+Rectangle {
+    id: container
+    width: 600; height: 200
+
+    Image {
+        id: pic
+        source: "pics/qt.png"
+        opacity: (600.0 - pic.x) / 600
+
+        MouseArea {
+            anchors.fill: parent
+            drag.target: pic
+            drag.axis: Drag.XAxis
+            drag.minimumX: 0
+            drag.maximumX: container.width - pic.width
+        }
+    }
+}
+//! [drag]
+
+//! [mousebuttons]
+Text {
+    text: mouseArea.pressedButtons & Qt.RightButton ? "right" : ""
+    horizontalAlignment: Text.AlignHCenter
+    verticalAlignment: Text.AlignVCenter
+
+    MouseArea {
+        id: mouseArea
+        anchors.fill: parent
+        acceptedButtons: Qt.LeftButton | Qt.RightButton
+    }
+}
+//! [mousebuttons]
+
+}
+
+}
diff --git a/doc/src/snippets/declarative/pathview/dummydata/MenuModel.qml b/doc/src/snippets/declarative/pathview/ContactModel.qml
index a52b60a..1a042a3 100644
--- a/doc/src/snippets/declarative/pathview/dummydata/MenuModel.qml
+++ b/doc/src/snippets/declarative/pathview/ContactModel.qml
@@ -39,20 +39,21 @@
 **
 ****************************************************************************/
 
+//![0]
 import Qt 4.7
 
 ListModel {
-    id: menuModel
     ListElement {
         name: "Bill Jones"
-        icon: "pics/qtlogo-64.png"
+        icon: "pics/qtlogo.png"
     }
     ListElement {
         name: "Jane Doe"
-        icon: "pics/qtlogo-64.png"
+        icon: "pics/qtlogo.png"
     }
     ListElement {
         name: "John Smith"
-        icon: "pics/qtlogo-64.png"
+        icon: "pics/qtlogo.png"
     }
 }
+//![0]
diff --git a/doc/src/snippets/declarative/pathview/pathattributes.qml b/doc/src/snippets/declarative/pathview/pathattributes.qml
index e8d2509..3ba3b95 100644
--- a/doc/src/snippets/declarative/pathview/pathattributes.qml
+++ b/doc/src/snippets/declarative/pathview/pathattributes.qml
@@ -39,16 +39,16 @@
 **
 ****************************************************************************/
 
+//! [0]
 import Qt 4.7
 
 Rectangle {
-    width: 240; height: 200; color: 'white'
-//! [0]
+    width: 240; height: 200
+
 //! [1]
     Component {
         id: delegate
         Item {
-            id: wrapper
             width: 80; height: 80
             scale: PathView.scale
             opacity: PathView.opacity
@@ -59,9 +59,12 @@ Rectangle {
         }
     }
 //! [1]
+
 //! [2]
     PathView {
-        anchors.fill: parent; model: MenuModel; delegate: delegate
+        anchors.fill: parent
+        model: ContactModel {}
+        delegate: delegate
         path: Path {
             startX: 120; startY: 100
             PathAttribute { name: "scale"; value: 1.0 }
@@ -73,5 +76,5 @@ Rectangle {
         }
     }
 //! [2]
-//! [0]
 }
+//! [0]
diff --git a/doc/src/snippets/declarative/pathview/pathview.qml b/doc/src/snippets/declarative/pathview/pathview.qml
index 31b793d..1669847 100644
--- a/doc/src/snippets/declarative/pathview/pathview.qml
+++ b/doc/src/snippets/declarative/pathview/pathview.qml
@@ -39,27 +39,27 @@
 **
 ****************************************************************************/
 
+//! [0]
 import Qt 4.7
 
 Rectangle {
-    width: 240; height: 200; color: 'white'
-//! [0]
+    width: 240; height: 200
+
 //! [1]
     Component {
         id: delegate
-        Item {
-            id: wrapper
-            width: 80; height: 80
-            Column {
-                Image { anchors.horizontalCenter: name.horizontalCenter; width: 64; height: 64; source: icon }
-                Text { text: name; font.pointSize: 16}
-            }
+        Column {
+            Image { anchors.horizontalCenter: name.horizontalCenter; width: 64; height: 64; source: icon }
+            Text { text: name; font.pointSize: 16 }
         }
     }
 //! [1]
+
 //! [2]
     PathView {
-        anchors.fill: parent; model: MenuModel; delegate: delegate
+        anchors.fill: parent
+        model: ContactModel {}
+        delegate: delegate
         path: Path {
             startX: 120; startY: 100
             PathQuad { x: 120; y: 25; controlX: 260; controlY: 75 }
@@ -67,5 +67,5 @@ Rectangle {
         }
     }
 //! [2]
-//! [0]
 }
+//! [0]
diff --git a/doc/src/snippets/declarative/pathview/pics/qtlogo-64.png b/doc/src/snippets/declarative/pathview/pics/qtlogo.png
index 4f68e16..4f68e16 100644
--- a/doc/src/snippets/declarative/pathview/pics/qtlogo-64.png
+++ b/doc/src/snippets/declarative/pathview/pics/qtlogo.png
diff --git a/doc/src/snippets/declarative/drag.qml b/doc/src/snippets/declarative/rect-border-width.qml
index 0a69574..73ce9f6 100644
--- a/doc/src/snippets/declarative/drag.qml
+++ b/doc/src/snippets/declarative/rect-border-width.qml
@@ -41,19 +41,20 @@
 
 import Qt 4.7
 
-//! [0]
+//![0]
 Rectangle {
-    id: blurtest; width: 600; height: 200; color: "white"
-    Image {
-        id: pic; source: "qtlogo-64.png"; anchors.verticalCenter: parent.verticalCenter
-        opacity: (600.0-pic.x) / 600;
-        MouseArea {
+    width: 100; height: 100
+    color: "yellow"
+
+    Rectangle {
+        anchors.fill: parent
+        anchors.margins: 10
+        clip: true
+
+        Rectangle {
             anchors.fill: parent
-            drag.target: pic
-            drag.axis: Drag.XAxis
-            drag.minimumX: 0
-            drag.maximumX: blurtest.width-pic.width
+            border.width: 1
         }
     }
 }
-//! [0]
+//![0]
diff --git a/doc/src/snippets/declarative/mouseregion.qml b/doc/src/snippets/declarative/repeater-modeldata.qml
index a162854..3b4cc6d 100644
--- a/doc/src/snippets/declarative/mouseregion.qml
+++ b/doc/src/snippets/declarative/repeater-modeldata.qml
@@ -41,35 +41,12 @@
 
 import Qt 4.7
 
-Rectangle { width: 200; height: 100
-Row {
 //! [0]
-Rectangle { 
-    width: 100; height: 100
-    color: "green"
-
-    MouseArea { 
-        anchors.fill: parent
-        onClicked: { parent.color = 'red' }
+Column {
+    Repeater {
+        model: ["apples", "oranges", "pears"]
+        Text { text: "Data: " + modelData }
     }
 }
 //! [0]
-//! [1]
-Rectangle {
-    width: 100; height: 100
-    color: "green"
 
-    MouseArea {
-        anchors.fill: parent
-        acceptedButtons: Qt.LeftButton | Qt.RightButton
-        onClicked: {
-            if (mouse.button == Qt.RightButton)
-                parent.color = 'blue';
-            else
-                parent.color = 'red';
-        }
-    }
-}
-//! [1]
-}
-}
diff --git a/doc/src/snippets/qxmlschema/main.cpp b/doc/src/snippets/qxmlschema/main.cpp
index 83fb245..26a8741 100644
--- a/doc/src/snippets/qxmlschema/main.cpp
+++ b/doc/src/snippets/qxmlschema/main.cpp
@@ -91,11 +91,8 @@ void Schema::loadFromData() const
                      "        elementFormDefault=\"qualified\">"
                      "</xsd:schema>" );
 
-    QBuffer buffer(&data);
-    buffer.open(QIODevice::ReadOnly);
-
     QXmlSchema schema;
-    schema.load(&buffer);
+    schema.load(data);
 
     if (schema.isValid())
         qDebug() << "schema is valid";
diff --git a/doc/src/template/images/arrow_down.png b/doc/src/template/images/arrow_down.png
new file mode 100644
index 0000000..9d01e97
--- /dev/null
+++ b/doc/src/template/images/arrow_down.png
diff --git a/doc/src/template/images/bg_ll_blank.png b/doc/src/template/images/bg_ll_blank.png
new file mode 100644
index 0000000..95a1c45
--- /dev/null
+++ b/doc/src/template/images/bg_ll_blank.png
diff --git a/doc/src/template/images/bg_ul_blank.png b/doc/src/template/images/bg_ul_blank.png
new file mode 100644
index 0000000..7051261
--- /dev/null
+++ b/doc/src/template/images/bg_ul_blank.png
diff --git a/doc/src/template/images/header_bg.png b/doc/src/template/images/header_bg.png
new file mode 100644
index 0000000..a436aa6
--- /dev/null
+++ b/doc/src/template/images/header_bg.png
diff --git a/doc/src/template/scripts/narrow.js b/doc/src/template/scripts/narrow.js
new file mode 100644
index 0000000..12d0ce8
--- /dev/null
+++ b/doc/src/template/scripts/narrow.js
@@ -0,0 +1,78 @@
+var narrowInit = function() {
+  /* TODO:
+  Could probably be more efficient, not hardcoding each element to be created
+  */
+  // 1: Create search form
+  var narrowSearch = $('<div id="narrowsearch"></div>');
+  var searchform = $("#qtdocsearch");
+  narrowSearch.append(searchform);
+  $("#qtdocheader .content .qtref").after(narrowSearch);
+
+  // 2: Create dropdowns
+  var narrowmenu = $('<ul id="narrowmenu" class="sf-menu"></ul>');
+
+  // Lookup
+  var lookuptext = $("#lookup h2").attr("title");
+  $("#lookup ul").removeAttr("id");
+  $("#lookup ul li").removeAttr("class");
+  $("#lookup ul li").removeAttr("style");
+  var lookupul = $("#lookup ul");
+  var lookuplist = $('<li></li>');
+  var lookuplink = $('<a href="#"></a>');
+  lookuplink.append(lookuptext);
+  lookuplist.append(lookuplink);
+  lookuplist.append(lookupul);
+  narrowmenu.append(lookuplist);
+
+  // Topics
+  var topicstext = $("#topics h2").attr("title");
+  $("#topics ul").removeAttr("id");
+  $("#topics ul li").removeAttr("class");
+  $("#topics ul li").removeAttr("style");
+  var topicsul = $("#topics ul");
+  var topicslist = $('<li></li>');
+  var topicslink = $('<a href="#"></a>');
+  topicslink.append(topicstext);
+  topicslist.append(topicslink);
+  topicslist.append(topicsul);
+  narrowmenu.append(topicslist);
+
+  // Examples
+  var examplestext = $("#examples h2").attr("title");
+  $("#examples ul").removeAttr("id");
+  $("#examples ul li").removeAttr("class");
+  $("#examples ul li").removeAttr("style");
+  var examplesul = $("#examples ul");
+  var exampleslist = $('<li></li>');
+  var exampleslink = $('<a href="#"></a>');
+  exampleslink.append(examplestext);
+  exampleslist.append(exampleslink);
+  exampleslist.append(examplesul);
+  narrowmenu.append(exampleslist);
+
+  $("#shortCut").after(narrowmenu);
+  $('ul#narrowmenu').superfish({
+    delay: 100,
+    autoArrows: false,
+    disableHI: true
+  });
+}
+
+$(document).ready(function(){
+  if ($('body').hasClass('narrow')) {
+    narrowInit();
+  }
+});
+
+$(window).bind('resize', function () {
+  if($(window).width()<600) {
+    $('body').addClass('narrow');
+
+    if ($("#narrowsearch").length == 0) {
+      narrowInit();
+    }
+  }
+  else {
+    $('body').removeClass('narrow');
+  }
+});
\ No newline at end of file
diff --git a/doc/src/template/scripts/superfish.js b/doc/src/template/scripts/superfish.js
new file mode 100644
index 0000000..c6a9c7d
--- /dev/null
+++ b/doc/src/template/scripts/superfish.js
@@ -0,0 +1,121 @@
+
+/*
+ * Superfish v1.4.8 - jQuery menu widget
+ * Copyright (c) 2008 Joel Birch
+ *
+ * Dual licensed under the MIT and GPL licenses:
+ * 	http://www.opensource.org/licenses/mit-license.php
+ * 	http://www.gnu.org/licenses/gpl.html
+ *
+ * CHANGELOG: http://users.tpg.com.au/j_birch/plugins/superfish/changelog.txt
+ */
+
+;(function($){
+	$.fn.superfish = function(op){
+
+		var sf = $.fn.superfish,
+			c = sf.c,
+			$arrow = $(['<span class="',c.arrowClass,'"> &#187;</span>'].join('')),
+			over = function(){
+				var $$ = $(this), menu = getMenu($$);
+				clearTimeout(menu.sfTimer);
+				$$.showSuperfishUl().siblings().hideSuperfishUl();
+			},
+			out = function(){
+				var $$ = $(this), menu = getMenu($$), o = sf.op;
+				clearTimeout(menu.sfTimer);
+				menu.sfTimer=setTimeout(function(){
+					o.retainPath=($.inArray($$[0],o.$path)>-1);
+					$$.hideSuperfishUl();
+					if (o.$path.length && $$.parents(['li.',o.hoverClass].join('')).length<1){over.call(o.$path);}
+				},o.delay);	
+			},
+			getMenu = function($menu){
+				var menu = $menu.parents(['ul.',c.menuClass,':first'].join(''))[0];
+				sf.op = sf.o[menu.serial];
+				return menu;
+			},
+			addArrow = function($a){ $a.addClass(c.anchorClass).append($arrow.clone()); };
+			
+		return this.each(function() {
+			var s = this.serial = sf.o.length;
+			var o = $.extend({},sf.defaults,op);
+			o.$path = $('li.'+o.pathClass,this).slice(0,o.pathLevels).each(function(){
+				$(this).addClass([o.hoverClass,c.bcClass].join(' '))
+					.filter('li:has(ul)').removeClass(o.pathClass);
+			});
+			sf.o[s] = sf.op = o;
+			
+			$('li:has(ul)',this)[($.fn.hoverIntent && !o.disableHI) ? 'hoverIntent' : 'hover'](over,out).each(function() {
+				if (o.autoArrows) addArrow( $('>a:first-child',this) );
+			})
+			.not('.'+c.bcClass)
+				.hideSuperfishUl();
+			
+			var $a = $('a',this);
+			$a.each(function(i){
+				var $li = $a.eq(i).parents('li');
+				$a.eq(i).focus(function(){over.call($li);}).blur(function(){out.call($li);});
+			});
+			o.onInit.call(this);
+			
+		}).each(function() {
+			var menuClasses = [c.menuClass];
+			if (sf.op.dropShadows  && !($.browser.msie && $.browser.version < 7)) menuClasses.push(c.shadowClass);
+			$(this).addClass(menuClasses.join(' '));
+		});
+	};
+
+	var sf = $.fn.superfish;
+	sf.o = [];
+	sf.op = {};
+	sf.IE7fix = function(){
+		var o = sf.op;
+		if ($.browser.msie && $.browser.version > 6 && o.dropShadows && o.animation.opacity!=undefined)
+			this.toggleClass(sf.c.shadowClass+'-off');
+		};
+	sf.c = {
+		bcClass     : 'sf-breadcrumb',
+		menuClass   : 'sf-js-enabled',
+		anchorClass : 'sf-with-ul',
+		arrowClass  : 'sf-sub-indicator',
+		shadowClass : 'sf-shadow'
+	};
+	sf.defaults = {
+		hoverClass	: 'sfHover',
+		pathClass	: 'overideThisToUse',
+		pathLevels	: 1,
+		delay		: 800,
+		animation	: {opacity:'show'},
+		speed		: 'normal',
+		autoArrows	: true,
+		dropShadows : true,
+		disableHI	: false,		// true disables hoverIntent detection
+		onInit		: function(){}, // callback functions
+		onBeforeShow: function(){},
+		onShow		: function(){},
+		onHide		: function(){}
+	};
+	$.fn.extend({
+		hideSuperfishUl : function(){
+			var o = sf.op,
+				not = (o.retainPath===true) ? o.$path : '';
+			o.retainPath = false;
+			var $ul = $(['li.',o.hoverClass].join(''),this).add(this).not(not).removeClass(o.hoverClass)
+					.find('>ul').hide().css('visibility','hidden');
+			o.onHide.call($ul);
+			return this;
+		},
+		showSuperfishUl : function(){
+			var o = sf.op,
+				sh = sf.c.shadowClass+'-off',
+				$ul = this.addClass(o.hoverClass)
+					.find('>ul:hidden').css('visibility','visible');
+			sf.IE7fix.call($ul);
+			o.onBeforeShow.call($ul);
+			$ul.animate(o.animation,o.speed,function(){ sf.IE7fix.call($ul); o.onShow.call($ul); });
+			return this;
+		}
+	});
+
+})(jQuery);
diff --git a/doc/src/template/style/OfflineStyle.css b/doc/src/template/style/OfflineStyle.css
new file mode 100644
index 0000000..ddd580a
--- /dev/null
+++ b/doc/src/template/style/OfflineStyle.css
@@ -0,0 +1,819 @@
+@media screen
+{
+    html
+    {
+        color: #000000;
+        background: #FFFFFF;
+    }
+    body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, code, form, fieldset, legend, input, button, textarea, p, blockquote, th, td
+    {
+        margin: 0;
+        padding: 0;
+    }
+    table
+    {
+        border-collapse: collapse;
+        border-spacing: 0;
+    }
+    fieldset, img
+    {
+        border: 0;
+    }
+    address, caption, cite, code, dfn, em, strong, th, var, optgroup
+    {
+        font-style: inherit;
+        font-weight: inherit;
+    }
+    del, ins
+    {
+        text-decoration: none;
+    }
+    li
+    {
+        list-style: none;
+    }
+    caption, th
+    {
+        text-align: left;
+    }
+    h1, h2, h3, h4, h5, h6
+    {
+        font-size: 100%;
+    }
+    q:before, q:after
+    {
+        content: '';
+    }
+    abbr, acronym
+    {
+        border: 0;
+        font-variant: normal;
+    }
+    sup
+    {
+        vertical-align: baseline;
+    }
+    sub
+    {
+        vertical-align: baseline;
+    }
+	tt, .qmlreadonly span, .qmldefault span
+	{
+		word-spacing:5px;
+	}
+    .heading
+    {
+        font: normal 600 16px/1.0 Arial;
+    }
+    .subtitle
+    {
+        font-size: 13px;
+    }
+    .small-subtitle
+    {
+        font-size: 13px;
+    }
+    legend
+    {
+        color: #000000;
+    }
+    input, button, textarea, select, optgroup, option
+    {
+        font-family: inherit;
+        font-size: inherit;
+        font-style: inherit;
+        font-weight: inherit;
+    }
+    input, button, textarea, select
+    {
+        font-size: 100%;
+    }
+    body
+    {
+        font: normal 13px/1.2 Verdana;
+        color: #363534;
+    }
+    strong
+    {
+        font-weight: bold;
+    }
+    em
+    {
+        font-style: italic;
+    }
+    a
+    {
+        color: #00732f;
+        text-decoration: none;
+    }
+    .header, .footer, .wrapper
+    {
+        /*min-width: 600px;*/
+        max-width: 1500px;
+        margin: 0 5px;
+    }
+    .wrapper
+    {
+	position:relative;
+	top:50px;
+    }
+    .wrapper .bd
+    {
+        position: relative;
+    }
+
+    .header, .footer
+    {
+        display: block;
+        clear: both;
+        overflow: hidden;
+    }
+    .header
+    {
+        height: 115px;
+        position: relative;
+    }
+    
+    
+    .header .qtref
+    {
+        position: absolute;
+        top: 28px;
+        left: 88px;
+        width: 302px;
+        height: 22px;
+    }
+    .header .qtref span
+    {
+        display: block;
+        height: 22px;
+    }
+    .wrap .content h1
+    {
+        font: 600 18px/1.2 Arial;
+    }
+    .wrap .content h2
+    {
+        font: 600 16px/1.2 Arial;
+    }
+    .wrap .content h3
+    {
+        font: 600 14px/1.2 Arial;
+    }
+    .wrap .content h4
+    {
+        font: 600 12px/1.2 Arial;
+    }
+	
+    .wrap .content p
+    {
+        line-height: 20px;
+        padding: 5px;
+    }
+    .wrap .content table p
+    {
+        line-height: 20px;
+        padding: 0px;
+    }	
+    .wrap .content ul
+    {
+        padding-left: 25px;
+        padding-top: 10px;
+    }
+    a:hover
+    {
+        color: #4c0033;
+        text-decoration: underline;
+    }
+    .content a:visited
+    {
+        color: #4c0033;
+        text-decoration: none;
+    }
+     .content a:visited:hover
+    {
+        color: #4c0033;
+        text-decoration: underline;
+    }   
+
+    pre
+    {
+        border: 1px solid #DDDDDD;
+        margin: 0 20px 10px 10px;
+        padding: 20px 15px 20px 20px;
+        overflow-x: auto;
+    }
+    table, pre
+    {
+        -moz-border-radius: 7px 7px 7px 7px;
+        background-color: #F6F6F6;
+        border: 1px solid #E6E6E6;
+        border-collapse: separate;
+        font-size: 11px;
+        /*min-width: 395px;*/
+        margin-bottom: 25px;
+        display: inline-block;
+    }
+    thead
+    {
+        margin-top: 5px;
+		font:600 12px/1.2 Arial;
+    }
+    th
+    {
+        padding: 5px 15px 5px 15px;
+        background-color: #E1E1E1;
+      /*  border-bottom: 1px solid #E6E6E6;*/
+        border-left: 1px solid #E6E6E6;
+      /*  border-right: 1px solid #E6E6E6;*/
+    }
+    td
+    {
+        padding: 3px 15px 3px 20px;
+  /*      border-left: 1px solid #E6E6E6;
+        border-right: 1px solid #E6E6E6;*/
+    }
+    tr.odd td:hover,  tr.even td:hover
+    {
+    /*    border-right: 1px solid #C3C3C3;
+        border-left: 1px solid #C3C3C3;*/
+    }
+		
+	td.rightAlign
+	{
+        padding: 3px 15px 3px 10px;
+	}
+    table tr.odd
+    {
+        border-left: 1px solid #E6E6E6;
+        background-color: #F6F6F6;
+        color: #66666E;
+    }
+    table tr.even
+    {
+        border-left: 1px solid #E6E6E6;
+        background-color: #ffffff;
+        color: #66666E;
+    }
+    table tr.odd td:hover, table tr.even td:hover
+    {
+        background-color: #E6E6E6;
+    }
+    		
+    span.comment
+    {
+        color: #8B0000;
+        font-style: italic;
+    }
+    span.string, span.char
+    {
+        color: #254117;
+    }
+
+    .qmltype
+    {
+        text-align: center;
+        font-size: 160%;
+    }
+    .qmlreadonly
+    {
+        float: right;
+        color: #254117;
+    }
+
+    .qmldefault
+    {
+        float: right;
+        color: red;
+    }
+
+	.footer
+    {
+		border-top:1px solid #E5E5E5;
+        min-height: 100px;
+        color: #797775;
+        font: normal 9px/1 Verdana;
+        text-align: center;
+        padding-top: 40px;
+        margin: 0;
+    }
+
+    
+     .wrap
+    {
+        margin: 0 5px 0 5px;
+    }
+    .wrap .toolbar
+    {
+     display:block;
+    }
+
+    .wrap .breadcrumb ul li
+    {
+        float: left;
+        background: url(../images/breadcrumb.png) no-repeat 0 5px;
+        padding-left: 15px;
+        margin-left: 15px;
+        font-weight: bold;
+    }
+    .wrap .breadcrumb ul li.last
+    {
+        font-weight: normal;
+    }
+    .wrap .breadcrumb ul li a
+    {
+      /*  color: #363534;*/
+        color: #00732F;
+    }
+    .wrap .breadcrumb ul li.first
+    {
+        background-image: none;
+        padding-left: 0;
+        margin-left: 0;
+    }
+    .wrap .content
+    {
+		word-wrap:break-word;
+    }
+    .wrap .content li
+    {
+        padding-left: 12px;
+        background: url(../images/bullet_sq.png) no-repeat 0 5px;
+        font: normal 400 10pt/1 Verdana;
+        margin-bottom: 10px; 
+    }
+
+    .offline .wrap .content
+    {
+        padding-top: 15px;
+    }
+
+    .header:after, .footer:after, .breadcrumb:after, .wrap .content:after, .group:after
+    {
+        content: ".";
+        display: block;
+        height: 0;
+        clear: both;
+        visibility: hidden;
+    }
+    
+    hr
+    {
+        background-color: #E6E6E6;
+        border: 1px solid #E6E6E6;
+        height: 1px;
+        width: 100%;
+        text-align: left;
+        margin: 5px 0px 5px 0px;
+    }
+
+    .content .alignedsummary
+    {
+        margin: 5px;
+		width:100%;
+    }
+
+     
+    .toc
+    {
+        float: right;
+        -moz-border-radius: 7px 7px 7px 7px;
+        background-color: #F6F6F6;
+        border: 1px solid #DDDDDD;
+        margin: 0 20px 10px 10px;
+        padding: 20px 15px 20px 20px;
+        height: auto;
+        width: 200px;
+    }
+
+    .toc h3, .generic a
+    {
+        font: 600 12px/1.2 Arial;
+    }
+
+    .wrap .content .toc ul
+    {
+        padding-left: 0px;
+    }
+
+
+    .wrap .content .toc .level2
+    {
+        margin-left: 15px;
+    }
+
+    .wrap .content .toc .level3
+    {
+        margin-left: 30px;
+    }
+
+    .content .toc li
+    {
+        font: normal 10px/1.2 Verdana;
+        background: url(../images/bullet_dn.png) no-repeat 0 5px;
+    }
+	
+	
+	.generic{
+		max-width:75%;
+	}
+	.generic td{
+		padding:0;
+	}
+	
+	.generic .odd .alphaChar{
+        background-color: #F6F6F6;
+	}
+	
+	.generic .even .alphaChar{
+        background-color: #FFFFFF;
+	}
+
+	.highlightedCode
+	{
+	margin:10px;
+	}
+
+	.flowList{
+	vertical-align:top;
+	}	
+	.alphaChar{
+	width:100%;
+	background-color:#F6F6F6;
+	border:1px solid #E6E6E6;
+	font-size:12pt;
+	padding-left:10px;
+	margin-top:10px;
+	margin-bottom:10px;
+	}
+
+	.flowList dl{
+	}
+	.flowList dd{
+	display:inline-block;
+	margin-left:10px;
+	width:250px;
+	}
+	.wrap .content .flowList p{
+	padding:0px;
+	}
+	
+    .relpage
+    {
+        -moz-border-radius: 7px 7px 7px 7px;
+        border: 1px solid #DDDDDD;
+        padding: 25px 25px;
+        clear: both;
+    }
+    .relpage ul
+    {
+        float: none;
+        padding: 15px;
+    }
+    .content .relpage li
+    {
+        font: normal 11px/1.2 Verdana;
+    }
+    h3.fn, span.fn
+    {
+        background-color: #F6F6F6;
+        border-width: 1px;
+        border-style: solid;
+        border-color: #E6E6E6;
+        font-weight: bold;
+		word-spacing:3px;
+    }
+
+	.functionIndex {
+	font-size:12pt;
+	word-spacing:10px;
+	margin-bottom:10px;
+    background-color: #F6F6F6;
+    border-width: 1px;
+    border-style: solid;
+    border-color: #E6E6E6;
+	width:100%;
+	}
+	
+	.centerAlign {	text-align:center;}
+	.rightAlign {text-align:right;}
+	.leftAlign {text-align:left;}
+	.topAlign{vertical-align:top	}
+	.functionIndex a{display:inline-block;}
+
+    /* start index box */
+    .indexbox
+    {
+        width: 100%;
+		display:inline-block;
+    }
+
+    .indexboxcont { display: block; }
+
+    .indexboxbar
+    {
+		border-bottom:1px solid #E5E5E5;
+        margin-bottom: 25px;
+    }
+
+    .indexboxcont .section
+    {
+        display: inline-block;
+        padding:0 2% 0 1%;
+        vertical-align:top;
+	}
+
+	.indexboxcont .section {
+	  float: left;
+	}
+
+    .indexboxcont .section p
+    {
+        padding-top: 20px;
+        padding-bottom: 20px;
+    }
+    .indexboxcont .sectionlist
+    {
+        display: inline-block;
+		vertical-align:top;
+        padding: 0;
+    }
+    .indexboxcont .sectionlist ul
+    {
+        margin-bottom: 20px;
+    }
+
+    .indexboxcont .sectionlist ul li
+    {
+        line-height: 12px;
+    }
+
+    .content .indexboxcont li
+    {
+        font: normal 600 13px/1 Verdana;
+    }
+
+    .indexbox a:hover, .indexbox a:visited:hover
+    {
+        color: #4c0033;
+        text-decoration: underline;
+    }
+
+    .indexbox a:visited
+    {
+        color: #00732f;
+        text-decoration: none;
+    }
+	
+	.indexbox .indexIcon {
+	width: 11%;
+	}
+	
+   
+    .indexboxcont:after
+    {
+        content: ".";
+        display: block;
+        height: 0;
+        clear: both;
+        visibility: hidden;
+    }
+	
+    body.offline
+    {
+      background-image: none;
+    }
+
+    .offline .footer {
+      margin: 0;
+    }
+    .offline .header
+    {
+      width: 100%;
+      margin: 0;
+      height: auto;
+      background-color: #ffffff;
+      padding: 10px 0 5px 0;
+      overflow: visible;
+	  border-bottom: solid #E5E5E5 1px;
+	  z-index:1;
+	  position:fixed;
+    }
+
+    .offline .header .content
+    {
+    }
+    .offline .header .qtref
+    {
+      color: #00732F;
+      position: static;
+      float: left;
+      margin-left: 5px;
+      font: bold 18px/1 Arial;
+    }
+
+    .offline .header .qtref:visited
+    {
+      color: #00732F;
+	  }
+    .offline .header .qtref:hover
+    {
+      color: #00732F;
+	  text-decoration:none;
+	  }
+    .offline .header .qtref span
+    {
+      background-image: none;
+      text-indent: 0;
+	  text-decoration:none;
+    }
+
+    .offline .wrap
+    {
+        margin: 0 5px 0 5px;
+    }
+
+    .offline .wrap .toolbar
+    {
+      display:block;
+	  padding-top:5px;
+    }
+
+    .offline .wrap .breadcrumb ul li {
+      font-weight: normal;
+    }
+
+    .offline .wrap .breadcrumb ul li a {
+      /*color: #44a51c;*/
+    }
+
+    .offline .wrap .breadcrumb ul li.last a {
+      /*color: #363534;*/
+    }
+    
+
+    
+    .narrow .indexboxcont .section {
+      width: 64%;
+      padding-left: 0;
+    }
+    
+    .narrow .indexboxcont .sectionlist {
+      width: 32.5%;
+    }
+
+    .header .icon,
+	.sidebar,
+	.feedback,
+	.t_button,
+    .feedback,
+	#feedbackBox,
+	#feedback,
+	#blurpage,
+	.indexbox .indexIcon span,
+	.wrapper .hd,
+	.offline .indexbox .indexIcon,
+	.offline .header #nav-logo,
+	#offlinemenu,
+	#offlinesearch,
+	.offline .header #nav-topright,
+    .offline .header #shortCut ,
+	.offline .wrapper .hd,
+    .offline .wrapper .ft,
+	.offline .sidebar,
+	.offline .wrap .feedback
+    {
+	display:none;
+    }
+
+    /* end offline mode */
+#narrowmenu {
+      display: none;
+      float: right;
+      margin: 15px 40px 0 0;
+      font-size: 11px;
+    }
+
+    .narrow #narrowmenu {
+      display: block;
+    }
+	
+	#narrowsearch{
+		display:none;
+	}
+
+	#narrowmenu ul
+	{
+	  border-bottom:solid 1px #E5E5E5;
+	  border-left:solid 1px #E5E5E5;
+	  border-right:solid 1px #E5E5E5;
+	}
+
+    #narrowmenu a {
+      line-height: 1.1;
+      background: url(../images/arrow_down.png) no-repeat 100% 50%;
+      white-space: nowrap;
+      padding: 0 16px 0 5px;
+    }
+
+    #narrowmenu li {
+      margin-left: 20px;
+    }
+
+    #narrowmenu li li {
+      margin: 0 0 5px 0;
+    }
+
+    #narrowmenu li li a {
+      padding: 0;
+      background-image: none;
+    }
+
+    #narrowmenu li,
+    #narrowmenu li ul {
+      background-color: #fff;
+    }
+
+    #narrowmenu li ul {
+      width: auto;
+      padding: 5px;
+ 	  margin-top:-15px;
+   }
+
+    .sf-menu li:hover ul, .sf-menu li.sfHover ul {
+      top: 1.2em;
+    }
+.sf-menu, .sf-menu * {
+	margin:			0;
+	padding:		0;
+	list-style:		none;
+}
+.sf-menu {
+	line-height:	1.0;
+}
+.sf-menu ul {
+	position:		absolute;
+	top:			-999em;
+	width:			10em; /* left offset of submenus need to match (see below) */
+}
+.sf-menu ul li {
+	width:			100%;
+}
+.sf-menu li:hover {
+	visibility:		inherit; /* fixes IE7 'sticky bug' */
+}
+.sf-menu li {
+	float:			left;
+	position:		relative;
+}
+.sf-menu a {
+	display:		block;
+	position:		relative;
+}
+.sf-menu li:hover ul,
+.sf-menu li.sfHover ul {
+	left:			0;
+	top:			2.5em; /* match top ul list item height */
+	z-index:		99;
+}
+ul.sf-menu li:hover li ul,
+ul.sf-menu li.sfHover li ul {
+	top:			-999em;
+}
+ul.sf-menu li li:hover ul,
+ul.sf-menu li li.sfHover ul {
+	left:			10em; /* match ul width */
+	top:			0;
+}
+ul.sf-menu li li:hover li ul,
+ul.sf-menu li li.sfHover li ul {
+	top:			-999em;
+}
+ul.sf-menu li li li:hover ul,
+ul.sf-menu li li li.sfHover ul {
+	left:			10em; /* match ul width */
+	top:			0;
+}
+
+}
+/* end of screen media */
+
+/* start of print media */
+
+@media print
+{
+     input, textarea, .header, .footer, .toolbar, .feedback, .wrapper .hd, .wrapper .bd .sidebar, .wrapper .ft
+    {
+        display: none;
+        background: none;
+    }
+    .content
+    {
+        position: absolute;
+        top: 0px;
+        left: 0px;
+        background: none;
+        display: block;
+    }
+}
+/* end of print media */
diff --git a/doc/src/template/style/narrow.css b/doc/src/template/style/narrow.css
new file mode 100644
index 0000000..05159aa
--- /dev/null
+++ b/doc/src/template/style/narrow.css
@@ -0,0 +1,250 @@
+    /* start narrow mode */
+
+    body.narrow
+    {
+      background-image: none;
+    }
+
+    .narrow a {
+      color: #44a51c;
+    }
+
+    .narrow .header, .narrow .header .content, .narrow .footer, .narrow .wrapper {
+      margin: 0 7px;
+      min-width: 300px;
+    }
+
+    .narrow .footer {
+      margin: 0;
+    }
+    .narrow .header
+    {
+      width: 100%;
+      margin: 0;
+      height: auto;
+      background: #fff url(../images/header_bg.png) repeat-x 0 100%;
+      padding: 10px 0 5px 0;
+      overflow: visible;
+    }
+
+    .narrow .header .content
+    {
+    }
+
+    .narrow .header #nav-logo
+    {
+      display: none;
+    }
+
+    .narrow .header .qtref
+    {
+      width: auto;
+      height: auto;
+      color: #363534;
+      position: static;
+      float: left;
+      margin-left: 25px;
+      font: bold 18px/1 Arial;
+    }
+
+    .narrow .header .qtref a
+    {
+      color: #363534;
+    }
+
+    .narrow .header .qtref span
+    {
+      background-image: none;
+      text-indent: 0;
+    }
+
+    .narrow .header #nav-topright
+    {
+      display: none;
+    }
+
+    .narrow .header #shortCut
+    {
+      clear: both;
+      font-weight: normal;
+      position: static;
+      float: left;
+      margin: 15px 0 0 25px;
+      overflow: hidden;
+      padding: 0;
+      height: auto;
+    }
+
+    .narrow .header #shortCut ul
+    {
+      float: none;
+      margin: 0;
+      width: auto;
+      font-size: 11px;
+    }
+
+    .narrow .header #shortCut ul li
+    {
+      background-image: none;
+    }
+
+    .narrow .header #shortCut ul .shortCut-topleft-active,
+    .narrow .header #shortCut ul .shortCut-topleft-inactive
+    {
+      background-image: none;
+      height: auto;
+      padding: 0;
+      width: auto;
+    }
+    .narrow .header #shortCut ul li a
+    {
+      color: #44a51c;
+    }
+
+    .narrow .wrapper .hd
+    {
+        background: url(../images/bg_ul_blank.png) no-repeat 0 0;
+    }
+
+    .narrow .wrapper .bd
+    {
+        background: url(../images/bg_l_blank.png) repeat-y 0 0;
+    }
+
+    .narrow .wrapper .ft
+    {
+        background: url(../images/bg_ll_blank.png) no-repeat 0 0;
+    }
+
+    .narrow .sidebar
+    {
+        display: none;
+    }
+
+    .narrow .wrap
+    {
+        margin: 0 5px 0 5px;
+    }
+
+    .narrow .wrap .toolbar
+    {
+      border-bottom: none;
+    }
+
+    .narrow .wrap .content
+    {
+        padding-top: 15px;
+    }
+
+    .narrow .wrap .feedback
+    {
+        display: none;
+    }
+
+    .narrow .wrap .breadcrumb ul li {
+      font-weight: normal;
+    }
+
+    .narrow .wrap .breadcrumb ul li a {
+      color: #44a51c;
+    }
+
+    .narrow .wrap .breadcrumb ul li.last a {
+      color: #363534;
+    }
+    
+    #narrowsearch {
+      display: none;
+    }
+
+    .narrow #narrowsearch {
+      display: block;
+      float: right;
+      margin-right: 25px;
+      _position: relative;
+    }
+
+    .narrow #narrowsearch fieldset {
+      _position: absolute;
+      _margin-top: -1px;
+    }
+
+    .narrow #narrowsearch {
+      background: url("http://doc.qt.nokia.com/prototype/html/images/sprites-combined.png") no-repeat scroll -6px -348px transparent;
+      height: 21px;
+      padding: 2px 0 0 5px;
+      width: 167px;
+    }
+
+    .narrow #narrowsearch input {
+      border: none;
+      font: 13px/1.2 Verdana;
+      height: 19px;
+      outline: none;
+      padding: 0;
+      width: 158px;
+      *border: 1px solid #fff;
+      *height: 17px;
+      _height: 18px;
+    }
+
+    .narrow .indexbox .indexIcon {
+      display: none;
+    }
+
+    .narrow .indexboxcont .section {
+      width: 64%;
+      padding-left: 0;
+    }
+    
+    .narrow .indexboxcont .sectionlist {
+      width: 32.5%;
+    }
+
+    #narrowmenu {
+      display: none;
+      float: right;
+      margin: 15px 40px 0 0;
+      font-size: 11px;
+    }
+
+    .narrow #narrowmenu {
+      display: block;
+    }
+
+    #narrowmenu a {
+      line-height: 1.1;
+      background: url(../images/arrow_down.png) no-repeat 100% 50%;
+      white-space: nowrap;
+      padding: 0 16px 0 5px;
+    }
+
+    #narrowmenu li {
+      margin-left: 20px;
+    }
+
+    #narrowmenu li li {
+      margin: 0 0 5px 0;
+    }
+
+    #narrowmenu li li a {
+      padding: 0;
+      background-image: none;
+    }
+
+    #narrowmenu li,
+    #narrowmenu li ul {
+      background-color: #fff;
+	  margin-top:-1px;
+    }
+
+    #narrowmenu li ul {
+      width: auto;
+      padding: 5px;
+    }
+
+    .sf-menu li:hover ul, .sf-menu li.sfHover ul {
+      top: 1.2em;
+    }
+
+    /* end narrow mode */
diff --git a/doc/src/template/style/superfish.css b/doc/src/template/style/superfish.css
new file mode 100644
index 0000000..0cf0f7d
--- /dev/null
+++ b/doc/src/template/style/superfish.css
@@ -0,0 +1,51 @@
+.sf-menu, .sf-menu * {
+	margin:			0;
+	padding:		0;
+	list-style:		none;
+}
+.sf-menu {
+	line-height:	1.0;
+}
+.sf-menu ul {
+	position:		absolute;
+	top:			-999em;
+	width:			10em; /* left offset of submenus need to match (see below) */
+}
+.sf-menu ul li {
+	width:			100%;
+}
+.sf-menu li:hover {
+	visibility:		inherit; /* fixes IE7 'sticky bug' */
+}
+.sf-menu li {
+	float:			left;
+	position:		relative;
+}
+.sf-menu a {
+	display:		block;
+	position:		relative;
+}
+.sf-menu li:hover ul,
+.sf-menu li.sfHover ul {
+	left:			0;
+	top:			2.5em; /* match top ul list item height */
+	z-index:		99;
+}
+ul.sf-menu li:hover li ul,
+ul.sf-menu li.sfHover li ul {
+	top:			-999em;
+}
+ul.sf-menu li li:hover ul,
+ul.sf-menu li li.sfHover ul {
+	left:			10em; /* match ul width */
+	top:			0;
+}
+ul.sf-menu li li:hover li ul,
+ul.sf-menu li li.sfHover li ul {
+	top:			-999em;
+}
+ul.sf-menu li li li:hover ul,
+ul.sf-menu li li li.sfHover ul {
+	left:			10em; /* match ul width */
+	top:			0;
+}
diff --git a/doc/src/template/style/superfish_skin.css b/doc/src/template/style/superfish_skin.css
new file mode 100644
index 0000000..8d84827
--- /dev/null
+++ b/doc/src/template/style/superfish_skin.css
@@ -0,0 +1,83 @@
+
+/*** DEMO SKIN ***/
+.sf-menu {
+	float:			left;
+	margin-bottom:	1em;
+}
+.sf-menu a {
+	border-left:	1px solid #fff;
+	border-top:		1px solid #CFDEFF;
+	padding: 		.75em 1em;
+	text-decoration:none;
+}
+.sf-menu a, .sf-menu a:visited  { /* visited pseudo selector so IE6 applies text colour*/
+	color:			#13a;
+}
+.sf-menu li {
+	background:		#BDD2FF;
+}
+.sf-menu li li {
+	background:		#AABDE6;
+}
+.sf-menu li li li {
+	background:		#9AAEDB;
+}
+.sf-menu li:hover, .sf-menu li.sfHover,
+.sf-menu a:focus, .sf-menu a:hover, .sf-menu a:active {
+	background:		#CFDEFF;
+	outline:		0;
+}
+
+/*** arrows **/
+.sf-menu a.sf-with-ul {
+	padding-right: 	2.25em;
+	min-width:		1px; /* trigger IE7 hasLayout so spans position accurately */
+}
+.sf-sub-indicator {
+	position:		absolute;
+	display:		block;
+	right:			.75em;
+	top:			1.05em; /* IE6 only */
+	width:			10px;
+	height:			10px;
+	text-indent: 	-999em;
+	overflow:		hidden;
+	background:		url('../images/arrows-ffffff.png') no-repeat -10px -100px; /* 8-bit indexed alpha png. IE6 gets solid image only */
+}
+a > .sf-sub-indicator {  /* give all except IE6 the correct values */
+	top:			.8em;
+	background-position: 0 -100px; /* use translucent arrow for modern browsers*/
+}
+/* apply hovers to modern browsers */
+a:focus > .sf-sub-indicator,
+a:hover > .sf-sub-indicator,
+a:active > .sf-sub-indicator,
+li:hover > a > .sf-sub-indicator,
+li.sfHover > a > .sf-sub-indicator {
+	background-position: -10px -100px; /* arrow hovers for modern browsers*/
+}
+
+/* point right for anchors in subs */
+.sf-menu ul .sf-sub-indicator { background-position:  -10px 0; }
+.sf-menu ul a > .sf-sub-indicator { background-position:  0 0; }
+/* apply hovers to modern browsers */
+.sf-menu ul a:focus > .sf-sub-indicator,
+.sf-menu ul a:hover > .sf-sub-indicator,
+.sf-menu ul a:active > .sf-sub-indicator,
+.sf-menu ul li:hover > a > .sf-sub-indicator,
+.sf-menu ul li.sfHover > a > .sf-sub-indicator {
+	background-position: -10px 0; /* arrow hovers for modern browsers*/
+}
+
+/*** shadows for all but IE6 ***/
+.sf-shadow ul {
+	background:	url('../images/shadow.png') no-repeat bottom right;
+	padding: 0 8px 9px 0;
+	-moz-border-radius-bottomleft: 17px;
+	-moz-border-radius-topright: 17px;
+	-webkit-border-top-right-radius: 17px;
+	-webkit-border-bottom-left-radius: 17px;
+}
+.sf-shadow ul.sf-shadow-off {
+	background: transparent;
+}