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

26 files changed, 1174 insertions, 263 deletions

diff --git a/doc/src/snippets/declarative/anchorchanges.qml b/doc/src/snippets/declarative/anchorchanges.qml
new file mode 100644
index 0000000..993618b
--- /dev/null
+++ b/doc/src/snippets/declarative/anchorchanges.qml
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** 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$
+**
+****************************************************************************/
+//![0]
+import Qt 4.7
+
+Rectangle {
+    id: window
+    width: 120; height: 120
+    color: "black"
+
+    Rectangle { id: myRect; width: 50; height: 50; color: "red" }
+
+    states: State {
+        name: "reanchored"
+
+        AnchorChanges {
+            target: myRect
+            anchors.top: window.top
+            anchors.bottom: window.bottom
+        }
+        PropertyChanges {
+            target: myRect
+            anchors.topMargin: 10
+            anchors.bottomMargin: 10
+        }
+    }
+
+    MouseArea { anchors.fill: parent; onClicked: window.state = "reanchored" }
+}
+//![0]
+
diff --git a/doc/src/snippets/declarative/animation.qml b/doc/src/snippets/declarative/animation.qml
new file mode 100644
index 0000000..65acd36
--- /dev/null
+++ b/doc/src/snippets/declarative/animation.qml
@@ -0,0 +1,181 @@
+/****************************************************************************
+**
+** 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
+
+Row {
+
+//![property-anim-1]
+Rectangle {
+    id: rect
+    width: 120; height: 200
+
+    Image {
+        id: img
+        source: "pics/qt.png"
+        x: 60 - img.width/2
+        y: 0
+
+        SequentialAnimation on y {
+            loops: Animation.Infinite
+            NumberAnimation { to: 200 - img.height; easing.type: Easing.OutBounce; duration: 2000 }
+            PauseAnimation { duration: 1000 }
+            NumberAnimation { to: 0; easing.type: Easing.OutQuad; duration: 1000 }
+        }
+    }
+}
+//![property-anim-1]
+
+//![property-anim-2]
+Rectangle {
+    width: 200; height: 200
+
+    Rectangle {
+        color: "red"
+        width: 50; height: 50
+        NumberAnimation on x { to: 50 }
+    }
+}
+//![property-anim-2]
+
+
+Item {
+//![property-anim-3]
+PropertyAnimation {
+    id: animation
+    target: image
+    property: "scale"
+    from: 1; to: 0.5
+}
+
+Image {
+    id: image
+    source: "pics/qt.png"
+    MouseArea {
+        anchors.fill: parent
+        onPressed: animation.start()
+    }
+}
+//![property-anim-3]
+}
+
+
+//![transitions-1]
+transitions: [
+    Transition {
+        NumberAnimation {
+            properties: "x,y"
+            easing.type: Easing.OutBounce
+            duration: 200
+        }
+    }
+]
+//![transitions-1]
+
+
+//![transitions-2]
+Transition {
+    from: "*"
+    to: "MyState"
+    reversible: true
+
+    SequentialAnimation {
+        NumberAnimation {
+            duration: 1000
+            easing.type: Easing.OutBounce
+
+            // animate myItem's x and y if they have changed in the state
+            target: myItem
+            properties: "x,y"
+        }
+
+        NumberAnimation {
+            duration: 1000
+
+            // animate myItem2's y to 200, regardless of what happens in the state
+            target: myItem2
+            property: "y"
+            to: 200
+        }
+    }
+}
+//![transitions-2]
+
+
+//![transitions-3]
+Transition {
+    from: "*"
+    to: "MyState"
+    reversible: true
+
+    SequentialAnimation {
+        ColorAnimation { duration: 1000 }
+        PauseAnimation { duration: 1000 }
+
+        ParallelAnimation {
+            NumberAnimation {
+                duration: 1000
+                easing.type: Easing.OutBounce
+                targets: box1
+                properties: "x,y"
+            }
+            NumberAnimation {
+                duration: 1000
+                targets: box2
+                properties: "x,y"
+            }
+        }
+    }
+}
+//![transitions-3]
+
+//![behavior]
+Rectangle {
+    id: redRect
+    color: "red"
+    width: 100; height: 100
+
+    Behavior on x { 
+        NumberAnimation { duration: 300; easing.type: Easing.InOutQuad }
+    }
+}
+//![behavior]
+
+}
diff --git a/doc/src/snippets/declarative/createQmlObject.qml b/doc/src/snippets/declarative/createQmlObject.qml
index f2ac6e6..f274e40 100644
--- a/doc/src/snippets/declarative/createQmlObject.qml
+++ b/doc/src/snippets/declarative/createQmlObject.qml
@@ -42,7 +42,7 @@
 import Qt 4.7
 
 Rectangle {
-    id: targetItem
+    id: parentItem
     property QtObject newObject
 
     width: 100
@@ -51,7 +51,7 @@ Rectangle {
     function createIt() {
 //![0]
 newObject = Qt.createQmlObject('import Qt 4.7; Rectangle {color: "red"; width: 20; height: 20}',
-    targetItem, "dynamicSnippet1");
+    parentItem, "dynamicSnippet1");
 //![0]
     }
 
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/listmodel-modify.qml b/doc/src/snippets/declarative/listmodel-modify.qml
new file mode 100644
index 0000000..03fb314
--- /dev/null
+++ b/doc/src/snippets/declarative/listmodel-modify.qml
@@ -0,0 +1,97 @@
+/****************************************************************************
+**
+** 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: 200; height: 200
+
+ListModel {
+    id: fruitModel
+
+    ListElement {
+        name: "Apple"
+        cost: 2.45
+        attributes: [
+            ListElement { description: "Core" },
+            ListElement { description: "Deciduous" }
+        ]
+    }
+    ListElement {
+        name: "Orange"
+        cost: 3.25
+        attributes: [
+            ListElement { description: "Citrus" }
+        ]
+    }
+    ListElement {
+        name: "Banana"
+        cost: 1.95
+        attributes: [
+            ListElement { description: "Tropical" },
+            ListElement { description: "Seedless" }
+        ]
+    }
+}
+
+//![delegate]
+    Component {
+        id: fruitDelegate
+        Item {
+            width: 200; height: 50
+            Text { text: name }
+            Text { text: '$' + cost; anchors.right: parent.right }
+
+            // Double the price when clicked.
+            MouseArea {
+                anchors.fill: parent
+                onClicked: fruitModel.setProperty(index, "cost", cost * 2)
+            }
+        }
+    }
+//![delegate]
+
+ListView {
+    width: 200; height: 200
+    model: fruitModel
+    delegate: fruitDelegate
+}
+
+}
diff --git a/doc/src/snippets/declarative/listmodel-nested.qml b/doc/src/snippets/declarative/listmodel-nested.qml
new file mode 100644
index 0000000..4ae43ff
--- /dev/null
+++ b/doc/src/snippets/declarative/listmodel-nested.qml
@@ -0,0 +1,103 @@
+/****************************************************************************
+**
+** 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: 200; height: 200
+
+
+//![model]
+ListModel {
+    id: fruitModel
+
+    ListElement {
+        name: "Apple"
+        cost: 2.45
+        attributes: [
+            ListElement { description: "Core" },
+            ListElement { description: "Deciduous" }
+        ]
+    }
+    ListElement {
+        name: "Orange"
+        cost: 3.25
+        attributes: [
+            ListElement { description: "Citrus" }
+        ]
+    }
+    ListElement {
+        name: "Banana"
+        cost: 1.95
+        attributes: [
+            ListElement { description: "Tropical" },
+            ListElement { description: "Seedless" }
+        ]
+    }
+}
+//![model]
+
+//![delegate]
+Component {
+    id: fruitDelegate
+    Item {
+        width: 200; height: 50
+        Text { id: nameField; text: name }
+        Text { text: '$' + cost; anchors.left: nameField.right }
+        Row {
+            anchors.top: nameField.bottom
+            spacing: 5
+            Text { text: "Attributes:" }
+            Repeater {
+                model: attributes
+                Text { text: description } 
+            }
+        }
+    }
+}
+//![delegate]
+
+ListView {
+    width: 200; height: 200
+    model: fruitModel
+    delegate: fruitDelegate
+}
+
+}
diff --git a/doc/src/snippets/declarative/listmodel-simple.qml b/doc/src/snippets/declarative/listmodel-simple.qml
new file mode 100644
index 0000000..00b8cb0
--- /dev/null
+++ b/doc/src/snippets/declarative/listmodel-simple.qml
@@ -0,0 +1,80 @@
+/****************************************************************************
+**
+** 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$
+**
+****************************************************************************/
+//![0]
+import Qt 4.7
+
+Rectangle {
+    width: 200; height: 200
+
+    ListModel {
+        id: fruitModel
+//![0]
+        ListElement {
+            name: "Apple"
+            cost: 2.45
+        }
+        ListElement {
+            name: "Orange"
+            cost: 3.25
+        }
+        ListElement {
+            name: "Banana"
+            cost: 1.95
+        }
+//![1]
+    }
+
+    Component {
+        id: fruitDelegate
+        Row {
+            spacing: 10
+            Text { text: name }
+            Text { text: '$' + cost }
+        }
+    }
+
+    ListView {
+        anchors.fill: parent
+        model: fruitModel
+        delegate: fruitDelegate
+    }
+}
+//![1]
diff --git a/doc/src/snippets/declarative/repeater-modeldata.qml b/doc/src/snippets/declarative/listmodel.qml
index 3b4cc6d..91b8230 100644
--- a/doc/src/snippets/declarative/repeater-modeldata.qml
+++ b/doc/src/snippets/declarative/listmodel.qml
@@ -38,15 +38,23 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
+//![0]
 import Qt 4.7
 
-//! [0]
-Column {
-    Repeater {
-        model: ["apples", "oranges", "pears"]
-        Text { text: "Data: " + modelData }
+ListModel {
+    id: fruitModel
+
+    ListElement {
+        name: "Apple"
+        cost: 2.45
+    }
+    ListElement {
+        name: "Orange"
+        cost: 3.25
+    }
+    ListElement {
+        name: "Banana"
+        cost: 1.95
     }
 }
-//! [0]
-
+//![0]
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/parentchange.qml b/doc/src/snippets/declarative/parentchange.qml
new file mode 100644
index 0000000..7f5718a
--- /dev/null
+++ b/doc/src/snippets/declarative/parentchange.qml
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** 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$
+**
+****************************************************************************/
+//![0]
+import Qt 4.7
+
+Rectangle {
+    width: 200
+    height: 100
+
+    Rectangle { 
+        id: redRect
+        width: 100; height: 100
+        color: "red"
+    }
+
+    Rectangle { 
+        id: blueRect
+        x: redRect.width
+        width: 50; height: 50
+        color: "blue"
+
+        states: State {
+            name: "reparented"
+            ParentChange { target: blueRect; parent: redRect; x: 10; y: 10 }
+        }
+
+        MouseArea { anchors.fill: parent; onClicked: blueRect.state = "reparented" }
+    }
+}
+//![0]
+
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/repeater.qml b/doc/src/snippets/declarative/repeater.qml
index 8b4d9cb..be5d62d 100644
--- a/doc/src/snippets/declarative/repeater.qml
+++ b/doc/src/snippets/declarative/repeater.qml
@@ -39,19 +39,52 @@
 **
 ****************************************************************************/
 
+//! [import]
 import Qt 4.7
+//! [import]
 
-Rectangle {
-    width: 220; height: 20; color: "white"
+Row {
 
-//! [0]
-    Row {
-        Rectangle { width: 10; height: 20; color: "red" }
-        Repeater {
-            model: 10 
-            Rectangle { width: 20; height: 20; radius: 10; color: "green" }
+//! [simple]
+Row {
+    Repeater {
+        model: 3
+        Rectangle { 
+            width: 100; height: 40
+            border.width: 1
+            color: "yellow"
         }
-        Rectangle { width: 10; height: 20; color: "blue" }
     }
-//! [0]
+}
+//! [simple]
+
+//! [index]
+Column {
+    Repeater {
+        model: 10 
+        Text { text: "I'm item " + index }
+    }
+}
+//! [index]
+
+//! [modeldata]
+Column {
+    Repeater {
+        model: ["apples", "oranges", "pears"]
+        Text { text: "Data: " + modelData }
+    }
+}
+//! [modeldata]
+
+//! [layout]
+Row {
+    Rectangle { width: 10; height: 20; color: "red" }
+    Repeater {
+        model: 10 
+        Rectangle { width: 20; height: 20; radius: 10; color: "green" }
+    }
+    Rectangle { width: 10; height: 20; color: "blue" }
+}
+//! [layout]
+
 }
diff --git a/doc/src/snippets/declarative/rotation.qml b/doc/src/snippets/declarative/rotation.qml
index 0fb9a61..5437292 100644
--- a/doc/src/snippets/declarative/rotation.qml
+++ b/doc/src/snippets/declarative/rotation.qml
@@ -38,37 +38,33 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
+//! [0]
 import Qt 4.7
 
-Rectangle {
-    width: 360; height: 80
-    color: "white"
-//! [0]
-    Row {
-        x: 10; y: 10
-        spacing: 10
-        Image { source: "pics/qt.png" }
-        Image {
-            source: "pics/qt.png"
-            transform: Rotation { origin.x: 30; origin.y: 30; axis { x: 0; y: 1; z: 0 } angle: 18 }
-            smooth: true
-        }
-        Image {
-            source: "pics/qt.png"
-            transform: Rotation { origin.x: 30; origin.y: 30; axis { x: 0; y: 1; z: 0 } angle: 36 }
-            smooth: true
-        }
-        Image {
-            source: "pics/qt.png"
-            transform: Rotation { origin.x: 30; origin.y: 30; axis { x: 0; y: 1; z: 0 } angle: 54 }
-            smooth: true
-        }
-        Image {
-            source: "pics/qt.png"
-            transform: Rotation { origin.x: 30; origin.y: 30; axis { x: 0; y: 1; z: 0 } angle: 72 }
-            smooth: true
-        }
+Row {
+    x: 10; y: 10
+    spacing: 10
+
+    Image { source: "pics/qt.png" }
+    Image {
+        source: "pics/qt.png"
+        transform: Rotation { origin.x: 30; origin.y: 30; axis { x: 0; y: 1; z: 0 } angle: 18 }
+        smooth: true
+    }
+    Image {
+        source: "pics/qt.png"
+        transform: Rotation { origin.x: 30; origin.y: 30; axis { x: 0; y: 1; z: 0 } angle: 36 }
+        smooth: true
+    }
+    Image {
+        source: "pics/qt.png"
+        transform: Rotation { origin.x: 30; origin.y: 30; axis { x: 0; y: 1; z: 0 } angle: 54 }
+        smooth: true
+    }
+    Image {
+        source: "pics/qt.png"
+        transform: Rotation { origin.x: 30; origin.y: 30; axis { x: 0; y: 1; z: 0 } angle: 72 }
+        smooth: true
     }
-//! [0]
 }
+//! [0]
diff --git a/doc/src/snippets/declarative/mouseregion.qml b/doc/src/snippets/declarative/state.qml
index a162854..a99c2e2 100644
--- a/doc/src/snippets/declarative/mouseregion.qml
+++ b/doc/src/snippets/declarative/state.qml
@@ -38,38 +38,32 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
+//![0]
 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' }
-    }
-}
-//! [0]
-//! [1]
 Rectangle {
+    id: myRect
     width: 100; height: 100
-    color: "green"
+    color: "black"
+
+    states: [
+        State {
+            name: "clicked"
+            PropertyChanges {
+                target: myRect
+                color: "red"
+            }
+        }
+    ]
 
     MouseArea {
         anchors.fill: parent
-        acceptedButtons: Qt.LeftButton | Qt.RightButton
         onClicked: {
-            if (mouse.button == Qt.RightButton)
-                parent.color = 'blue';
+            if (myRect.state == "")     // i.e. the default state
+                myRect.state = "clicked";
             else
-                parent.color = 'red';
+                myRect.state = "";
         }
     }
 }
-//! [1]
-}
-}
+//![0]
diff --git a/doc/src/snippets/declarative/states.qml b/doc/src/snippets/declarative/states.qml
new file mode 100644
index 0000000..c3b1796
--- /dev/null
+++ b/doc/src/snippets/declarative/states.qml
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** 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$
+**
+****************************************************************************/
+//![0]
+import Qt 4.7
+
+Item {
+    id: myItem
+    width: 200; height: 200
+
+    Rectangle {
+        id: myRect
+        width: 100; height: 100
+        color: "red"
+    }
+
+    states: [
+        State {
+            name: "moved"
+            PropertyChanges {
+                target: myRect
+                x: 50
+                y: 50
+            }
+        }
+    ]
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: myItem.state = 'moved'
+    }
+//![0]
+
+//![transitions]
+transitions: [
+    Transition {
+        NumberAnimation { properties: "x,y"; duration: 500 }
+    }
+]
+//![transitions]
+
+//![1]
+}
+//![1]
diff --git a/doc/src/snippets/declarative/repeater-index.qml b/doc/src/snippets/declarative/systempalette.qml
index 3eee742..98b333e 100644
--- a/doc/src/snippets/declarative/repeater-index.qml
+++ b/doc/src/snippets/declarative/systempalette.qml
@@ -38,19 +38,18 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
+//![0]
 import Qt 4.7
 
 Rectangle {
-    width: 50; height: childrenRect.height; color: "white"
+    SystemPalette { id: myPalette; colorGroup: SystemPalette.Active }
+
+    width: 640; height: 480
+    color: myPalette.window
 
-//! [0]
-    Column {
-        Repeater {
-            model: 10 
-            Text { text: "I'm item " + index }
-        }
+    Text {
+        anchors.fill: parent
+        text: "Hello!"; color: myPalette.windowText
     }
-//! [0]
 }
-
+//![0]
diff --git a/doc/src/snippets/declarative/drag.qml b/doc/src/snippets/declarative/visualdatamodel.qml
index 0a69574..cdde513 100644
--- a/doc/src/snippets/declarative/drag.qml
+++ b/doc/src/snippets/declarative/visualdatamodel.qml
@@ -38,22 +38,28 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
+//![0]
 import Qt 4.7
 
-//! [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 {
-            anchors.fill: parent
-            drag.target: pic
-            drag.axis: Drag.XAxis
-            drag.minimumX: 0
-            drag.maximumX: blurtest.width-pic.width
+    width: 200; height: 100
+
+    VisualDataModel {
+        id: visualModel
+        model: ListModel {
+            ListElement { name: "Apple" }
+            ListElement { name: "Orange" }
+        }
+        delegate: Rectangle {
+            height: 25
+            width: 100
+            Text { text: "Name: " + name}
         }
     }
+
+    ListView {
+        anchors.fill: parent
+        model: visualModel
+    }
 }
-//! [0]
+//![0]
diff --git a/doc/src/snippets/declarative/visualdatamodel_rootindex/main.cpp b/doc/src/snippets/declarative/visualdatamodel_rootindex/main.cpp
new file mode 100644
index 0000000..174adee
--- /dev/null
+++ b/doc/src/snippets/declarative/visualdatamodel_rootindex/main.cpp
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** 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$
+**
+****************************************************************************/
+#include <QDeclarativeView>
+#include <QDeclarativeContext>
+
+#include <QApplication>
+#include <QDirModel>
+
+//![0]
+int main(int argc, char ** argv)
+{
+    QApplication app(argc, argv);
+
+    QDeclarativeView view;
+
+    QDirModel model;
+    view.rootContext()->setContextProperty("dirModel", &model);
+
+    view.setSource(QUrl::fromLocalFile("view.qml"));
+    view.show();
+
+    return app.exec();
+}
+//![0]
+
diff --git a/doc/src/snippets/declarative/visualdatamodel_rootindex/view.qml b/doc/src/snippets/declarative/visualdatamodel_rootindex/view.qml
new file mode 100644
index 0000000..e623faa
--- /dev/null
+++ b/doc/src/snippets/declarative/visualdatamodel_rootindex/view.qml
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** 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$
+**
+****************************************************************************/
+//![0]
+import Qt 4.7
+
+ListView {
+    id: view
+    width: 300
+    height: 400
+
+    model: VisualDataModel {
+        model: dirModel
+
+        delegate: Rectangle {
+            width: 200; height: 25
+            Text { text: filePath }
+
+            MouseArea {
+                anchors.fill: parent
+                onClicked: {
+                    if (hasModelChildren) 
+                        view.model.rootIndex = view.model.modelIndex(index)
+                }
+            }
+        }
+    }
+}
+//![0]
diff --git a/doc/src/snippets/declarative/visualdatamodel_rootindex/visualdatamodel_rootindex.pro b/doc/src/snippets/declarative/visualdatamodel_rootindex/visualdatamodel_rootindex.pro
new file mode 100644
index 0000000..fec070c
--- /dev/null
+++ b/doc/src/snippets/declarative/visualdatamodel_rootindex/visualdatamodel_rootindex.pro
@@ -0,0 +1,4 @@
+TEMPLATE = app
+QT += gui declarative
+
+SOURCES += main.cpp
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";