Merge branch '4.7-upstream' into 4.7-water

1 files changed, 8 insertions, 8 deletions

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.qml b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.qml
index 12d7897..4548e5b 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.qml
@@ -246,7 +246,7 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "78422e0e8d323dea6aa655a2980b7562"
+        image: "follow.1.png"
     }
     Frame {
         msec: 992
@@ -494,7 +494,7 @@ VisualTest {
     }
     Frame {
         msec: 1936
-        hash: "379d5c4ced414f856e476095fbedfb7d"
+        image: "follow.2.png"
     }
     Frame {
         msec: 1952
@@ -734,7 +734,7 @@ VisualTest {
     }
     Frame {
         msec: 2896
-        hash: "3c5d3d10bacc093afc6a9c0b5aa4cddc"
+        image: "follow.3.png"
     }
     Frame {
         msec: 2912
@@ -982,7 +982,7 @@ VisualTest {
     }
     Frame {
         msec: 3856
-        hash: "0aed83364cd59e3f7309c92593894d43"
+        image: "follow.4.png"
     }
     Frame {
         msec: 3872
@@ -1222,7 +1222,7 @@ VisualTest {
     }
     Frame {
         msec: 4816
-        hash: "a510d302d2441b9a07463aed8b592d32"
+        image: "follow.5.png"
     }
     Frame {
         msec: 4832
@@ -1462,7 +1462,7 @@ VisualTest {
     }
     Frame {
         msec: 5776
-        hash: "6354ebe3aa919a52902b5a5346b473ae"
+        image: "follow.6.png"
     }
     Frame {
         msec: 5792
@@ -1702,7 +1702,7 @@ VisualTest {
     }
     Frame {
         msec: 6736
-        hash: "228920e994ebf71d542c71ce8263614e"
+        image: "follow.7.png"
     }
     Frame {
         msec: 6752
@@ -1731,7 +1731,7 @@ VisualTest {
     Key {
         type: 6
         key: 16777249
-        modifiers: 0
+        modifiers: 67108864
         text: ""
         autorep: false
         count: 1