Merge branch '4.7' of ../oslo-staging-1 into 4.7

3 files changed, 11 insertions, 7 deletions

diff --git a/doc/src/snippets/declarative/gridview/gridview.qml b/doc/src/snippets/declarative/gridview/gridview.qml
index 7377cee..e92a429 100644
--- a/doc/src/snippets/declarative/gridview/gridview.qml
+++ b/doc/src/snippets/declarative/gridview/gridview.qml
@@ -108,8 +108,10 @@ Component {
     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 }
+        x: view.currentItem.x
+        y: view.currentItem.y
+        Behavior on x { SpringAnimation { spring: 3; damping: 0.2 } }
+        Behavior on y { SpringAnimation { spring: 3; damping: 0.2 } }
     }
 }
 
diff --git a/doc/src/snippets/declarative/listview/listview.qml b/doc/src/snippets/declarative/listview/listview.qml
index 0c6dfd4..cde820e 100644
--- a/doc/src/snippets/declarative/listview/listview.qml
+++ b/doc/src/snippets/declarative/listview/listview.qml
@@ -99,10 +99,12 @@ Component {
     Rectangle {
         width: 180; height: 40
         color: "lightsteelblue"; radius: 5
-        SpringFollow on y {
-            to: list.currentItem.y
-            spring: 3
-            damping: 0.2
+        y: list.currentItem.y
+        Behavior on y {
+            SpringAnimation {
+                spring: 3
+                damping: 0.2
+            }
         }
     }
 }
diff --git a/doc/src/snippets/declarative/visualdatamodel_rootindex/view.qml b/doc/src/snippets/declarative/visualdatamodel_rootindex/view.qml
index 835ca32..9e759f9 100644
--- a/doc/src/snippets/declarative/visualdatamodel_rootindex/view.qml
+++ b/doc/src/snippets/declarative/visualdatamodel_rootindex/view.qml
@@ -55,7 +55,7 @@ ListView {
             MouseArea {
                 anchors.fill: parent
                 onClicked: {
-                    if (hasModelChildren) 
+                    if (model.hasModelChildren) 
                         view.model.rootIndex = view.model.modelIndex(index)
                 }
             }