Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into QTBUG-15333

1 files changed, 29 insertions, 29 deletions

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativemousearea/data/mousearea-flickable.qml b/tests/auto/declarative/qmlvisual/qdeclarativemousearea/data/mousearea-flickable.qml
index 50ef6e8..c862678 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativemousearea/data/mousearea-flickable.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemousearea/data/mousearea-flickable.qml
@@ -6,7 +6,7 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "cc1fd2f4c3be318052254a9b6be7a57b"
+        image: "mousearea-flickable.0.png"
     }
     Frame {
         msec: 32
@@ -242,11 +242,11 @@ VisualTest {
     }
     Frame {
         msec: 960
-        image: "mousearea-flickable.0.png"
+        hash: "cc1fd2f4c3be318052254a9b6be7a57b"
     }
     Frame {
         msec: 976
-        hash: "cc1fd2f4c3be318052254a9b6be7a57b"
+        image: "mousearea-flickable.1.png"
     }
     Frame {
         msec: 992
@@ -482,11 +482,11 @@ VisualTest {
     }
     Frame {
         msec: 1920
-        image: "mousearea-flickable.1.png"
+        hash: "cc1fd2f4c3be318052254a9b6be7a57b"
     }
     Frame {
         msec: 1936
-        hash: "cc1fd2f4c3be318052254a9b6be7a57b"
+        image: "mousearea-flickable.2.png"
     }
     Frame {
         msec: 1952
@@ -730,11 +730,11 @@ VisualTest {
     }
     Frame {
         msec: 2880
-        image: "mousearea-flickable.2.png"
+        hash: "4a60ab820ca66548384b2257b21de8ec"
     }
     Frame {
         msec: 2896
-        hash: "4a60ab820ca66548384b2257b21de8ec"
+        image: "mousearea-flickable.3.png"
     }
     Frame {
         msec: 2912
@@ -970,11 +970,11 @@ VisualTest {
     }
     Frame {
         msec: 3840
-        image: "mousearea-flickable.3.png"
+        hash: "4a60ab820ca66548384b2257b21de8ec"
     }
     Frame {
         msec: 3856
-        hash: "4a60ab820ca66548384b2257b21de8ec"
+        image: "mousearea-flickable.4.png"
     }
     Frame {
         msec: 3872
@@ -1474,7 +1474,7 @@ VisualTest {
     }
     Frame {
         msec: 4800
-        image: "mousearea-flickable.4.png"
+        hash: "b66571ae47bf129be88dc66785a81a7d"
     }
     Mouse {
         type: 5
@@ -1486,7 +1486,7 @@ VisualTest {
     }
     Frame {
         msec: 4816
-        hash: "7fb0ed99b7d751d1f335afd7c0de2f2c"
+        image: "mousearea-flickable.5.png"
     }
     Mouse {
         type: 5
@@ -2090,11 +2090,11 @@ VisualTest {
     }
     Frame {
         msec: 5760
-        image: "mousearea-flickable.5.png"
+        hash: "d75a43305e2884759ca41d7b1cbadf52"
     }
     Frame {
         msec: 5776
-        hash: "d75a43305e2884759ca41d7b1cbadf52"
+        image: "mousearea-flickable.6.png"
     }
     Frame {
         msec: 5792
@@ -2338,11 +2338,11 @@ VisualTest {
     }
     Frame {
         msec: 6720
-        image: "mousearea-flickable.6.png"
+        hash: "037386eb30a5e8d53a20a11258ee0f60"
     }
     Frame {
         msec: 6736
-        hash: "037386eb30a5e8d53a20a11258ee0f60"
+        image: "mousearea-flickable.7.png"
     }
     Frame {
         msec: 6752
@@ -2578,11 +2578,11 @@ VisualTest {
     }
     Frame {
         msec: 7680
-        image: "mousearea-flickable.7.png"
+        hash: "037386eb30a5e8d53a20a11258ee0f60"
     }
     Frame {
         msec: 7696
-        hash: "037386eb30a5e8d53a20a11258ee0f60"
+        image: "mousearea-flickable.8.png"
     }
     Frame {
         msec: 7712
@@ -3178,7 +3178,7 @@ VisualTest {
     }
     Frame {
         msec: 8640
-        image: "mousearea-flickable.8.png"
+        hash: "524db6ce45674c777d72f9206415be2f"
     }
     Mouse {
         type: 5
@@ -3190,7 +3190,7 @@ VisualTest {
     }
     Frame {
         msec: 8656
-        hash: "da5c33ee9e9e1d9aaa7d5efa83b8bf69"
+        image: "mousearea-flickable.9.png"
     }
     Mouse {
         type: 5
@@ -3546,11 +3546,11 @@ VisualTest {
     }
     Frame {
         msec: 9600
-        image: "mousearea-flickable.9.png"
+        hash: "cc1fd2f4c3be318052254a9b6be7a57b"
     }
     Frame {
         msec: 9616
-        hash: "cc1fd2f4c3be318052254a9b6be7a57b"
+        image: "mousearea-flickable.10.png"
     }
     Frame {
         msec: 9632
@@ -3794,11 +3794,11 @@ VisualTest {
     }
     Frame {
         msec: 10560
-        image: "mousearea-flickable.10.png"
+        hash: "90cdfe8920f115fd55cde6fdbd95e867"
     }
     Frame {
         msec: 10576
-        hash: "90cdfe8920f115fd55cde6fdbd95e867"
+        image: "mousearea-flickable.11.png"
     }
     Frame {
         msec: 10592
@@ -4346,7 +4346,7 @@ VisualTest {
     }
     Frame {
         msec: 11520
-        image: "mousearea-flickable.11.png"
+        hash: "72e75cfa62993593303b25cbff4af0e6"
     }
     Mouse {
         type: 5
@@ -4366,7 +4366,7 @@ VisualTest {
     }
     Frame {
         msec: 11536
-        hash: "05b3013c9e42ed9ced7009d2e2999357"
+        image: "mousearea-flickable.12.png"
     }
     Mouse {
         type: 5
@@ -4858,11 +4858,11 @@ VisualTest {
     }
     Frame {
         msec: 12480
-        image: "mousearea-flickable.12.png"
+        hash: "86b32befe0dada5bdce82a7dd14777ce"
     }
     Frame {
         msec: 12496
-        hash: "a569789b082296415321ba11c859abe5"
+        image: "mousearea-flickable.13.png"
     }
     Frame {
         msec: 12512
@@ -5106,11 +5106,11 @@ VisualTest {
     }
     Frame {
         msec: 13440
-        image: "mousearea-flickable.13.png"
+        hash: "cc1fd2f4c3be318052254a9b6be7a57b"
     }
     Frame {
         msec: 13456
-        hash: "cc1fd2f4c3be318052254a9b6be7a57b"
+        image: "mousearea-flickable.14.png"
     }
     Frame {
         msec: 13472