1 files changed, 17 insertions, 9 deletions
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/follow.qml b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/follow.qml
index cabdce7..05b93df 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/follow.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/follow.qml
@@ -3,6 +3,7 @@ import Qt 4.7
 Rectangle {
     color: "#ffffff"
     width: 320; height: 240
+
     Rectangle {
         id: rect
         color: "#00ff00"
@@ -25,22 +26,22 @@ Rectangle {
     Rectangle {
         color: "#ff0000"
         x: rect.width; width: rect.width; height: 20
-        y: 200
-        SpringFollow on y { to: rect.y; velocity: 200 }
+        y: rect.y
+        Behavior on y { SpringAnimation { velocity: 200 } }
     }
 
     // Spring
     Rectangle {
         color: "#ff0000"
         x: rect.width * 2; width: rect.width/2; height: 20
-        y: 200
-        SpringFollow on y { to: rect.y; spring: 1.0; damping: 0.2 }
+        y: rect.y
+        Behavior on y { SpringAnimation { spring: 1.0; damping: 0.2 } }
     }
     Rectangle {
         color: "#880000"
         x: rect.width * 2.5; width: rect.width/2; height: 20
-        y: 200
-        SpringFollow on y { to: rect.y; spring: 1.0; damping: 0.2; mass: 3.0 } // "heavier" object
+        y: rect.y
+        Behavior on y { SpringAnimation { spring: 1.0; damping: 0.2; mass: 3.0 } } // "heavier" object
     }
 
     // Follow mouse
@@ -49,15 +50,22 @@ Rectangle {
         anchors.fill: parent
         Rectangle {
             id: ball
+            property int targetX: mouseRegion.mouseX - 10
+            property int targetY: mouseRegion.mouseY - 10
+
+            x: targetX
+            y: targetY
             width: 20; height: 20
             radius: 10
             color: "#0000ff"
-            SpringFollow on x { id: f1; to: mouseRegion.mouseX-10; spring: 1.0; damping: 0.05; epsilon: 0.25 }
-            SpringFollow on y { id: f2; to: mouseRegion.mouseY-10; spring: 1.0; damping: 0.05; epsilon: 0.25 }
+
+            Behavior on x { SpringAnimation { spring: 1.0; damping: 0.05; epsilon: 0.25 } }
+            Behavior on y { SpringAnimation { spring: 1.0; damping: 0.05; epsilon: 0.25 } }
+
             states: [
                 State {
                     name: "following"
-                    when: !f1.inSync || !f2.inSync
+                    when: ball.x != ball.targetX || ball.y != ball.targetY
                     PropertyChanges { target: ball; color: "#ff0000" }
                 }
             ]