Merge branch 4.7 into qt-master-from-4.7

1 files changed, 66 insertions, 66 deletions

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide.qml
index 9439f73..718375a 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide.qml
@@ -6,239 +6,239 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 32
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 48
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 64
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 80
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 96
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 112
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 128
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 144
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 160
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 176
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 192
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 208
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 224
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 240
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 256
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 272
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 288
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 304
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 320
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 336
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 352
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 368
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 384
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 400
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 416
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 432
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 448
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 464
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 480
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 496
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 512
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 528
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 544
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 560
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 576
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 592
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 608
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 624
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 640
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 656
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 672
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 688
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 704
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 720
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 736
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 752
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 768
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 784
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 800
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 816
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 832
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 848
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 864
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 880
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 896
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 912
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 928
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 944
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 960
@@ -246,34 +246,34 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Key {
         type: 6
         key: 16777249
-        modifiers: 0
+        modifiers: 67108864
         text: ""
         autorep: false
         count: 1
     }
     Frame {
         msec: 992
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 1008
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 1024
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 1040
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
     Frame {
         msec: 1056
-        hash: "1678890d66761a30100c37132ccec9a2"
+        hash: "10e33a5f4c2161281d5a6b4481a17921"
     }
 }