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

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (69 commits)
  Remove use of SpringFollow and SmoothedFollow in qmlvisual test
  Fix Mac CI
  Add copy(), cut() and paste() support to TextInput
  Fix .pro file after class/test rename.
  Fix QTextDocument::markContentsDirty()
  Replace 4.6 in all .qdocconf files
  Resetting bindings through debugger interface
  Fix crash with invalid role indexes
  Make test pass and fix docs following removal of SpringFollow
  Remove autotests of depracted element SmoothedFollow
  doc improvements
  Clean up at the end of each test.
  Improve test reliability.
  Fix crash
  Follow -> Behavior
  Added some documentation to spring animation
  Fix spring animation
  Update QtDeclarative def files
  Fix exponential behavior of QTextCursor::removeSelectedText
  Optimization: change signal/slot to function call
  ...

2 files changed, 10 insertions, 6 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
+            }
         }
     }
 }