18 files changed, 533 insertions, 925 deletions

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.0.png
index 5243f4a..8b6329d 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.qml
index ad7f35e..85c0cce 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.qml
@@ -6,239 +6,239 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "5033bd624cd855ba10da39e6cb30e7d2"
+        hash: "75c15f88551f961727b547082216d0bb"
     }
     Frame {
         msec: 32
-        hash: "5033bd624cd855ba10da39e6cb30e7d2"
+        hash: "75c15f88551f961727b547082216d0bb"
     }
     Frame {
         msec: 48
-        hash: "5033bd624cd855ba10da39e6cb30e7d2"
+        hash: "75c15f88551f961727b547082216d0bb"
     }
     Frame {
         msec: 64
-        hash: "5033bd624cd855ba10da39e6cb30e7d2"
+        hash: "75c15f88551f961727b547082216d0bb"
     }
     Frame {
         msec: 80
-        hash: "5033bd624cd855ba10da39e6cb30e7d2"
+        hash: "75c15f88551f961727b547082216d0bb"
     }
     Frame {
         msec: 96
-        hash: "5033bd624cd855ba10da39e6cb30e7d2"
+        hash: "75c15f88551f961727b547082216d0bb"
     }
     Frame {
         msec: 112
-        hash: "5033bd624cd855ba10da39e6cb30e7d2"
+        hash: "75c15f88551f961727b547082216d0bb"
     }
     Frame {
         msec: 128
-        hash: "5033bd624cd855ba10da39e6cb30e7d2"
+        hash: "75c15f88551f961727b547082216d0bb"
     }
     Frame {
         msec: 144
-        hash: "5033bd624cd855ba10da39e6cb30e7d2"
+        hash: "75c15f88551f961727b547082216d0bb"
     }
     Frame {
         msec: 160
-        hash: "5033bd624cd855ba10da39e6cb30e7d2"
+        hash: "75c15f88551f961727b547082216d0bb"
     }
     Frame {
         msec: 176
-        hash: "d0d1afd7d8ff38e033cec4fa68978767"
+        hash: "1a58de7b864ae75e65f69461155cbfb2"
     }
     Frame {
         msec: 192
-        hash: "d0d1afd7d8ff38e033cec4fa68978767"
+        hash: "1a58de7b864ae75e65f69461155cbfb2"
     }
     Frame {
         msec: 208
-        hash: "d0d1afd7d8ff38e033cec4fa68978767"
+        hash: "1a58de7b864ae75e65f69461155cbfb2"
     }
     Frame {
         msec: 224
-        hash: "d0d1afd7d8ff38e033cec4fa68978767"
+        hash: "1a58de7b864ae75e65f69461155cbfb2"
     }
     Frame {
         msec: 240
-        hash: "d0d1afd7d8ff38e033cec4fa68978767"
+        hash: "1a58de7b864ae75e65f69461155cbfb2"
     }
     Frame {
         msec: 256
-        hash: "d0d1afd7d8ff38e033cec4fa68978767"
+        hash: "1a58de7b864ae75e65f69461155cbfb2"
     }
     Frame {
         msec: 272
-        hash: "d0d1afd7d8ff38e033cec4fa68978767"
+        hash: "1a58de7b864ae75e65f69461155cbfb2"
     }
     Frame {
         msec: 288
-        hash: "d0d1afd7d8ff38e033cec4fa68978767"
+        hash: "1a58de7b864ae75e65f69461155cbfb2"
     }
     Frame {
         msec: 304
-        hash: "d0d1afd7d8ff38e033cec4fa68978767"
+        hash: "1a58de7b864ae75e65f69461155cbfb2"
     }
     Frame {
         msec: 320
-        hash: "d0d1afd7d8ff38e033cec4fa68978767"
+        hash: "1a58de7b864ae75e65f69461155cbfb2"
     }
     Frame {
         msec: 336
-        hash: "26eed73af37b01ebecb4ee98ed9d67c6"
+        hash: "8a6b615ce522e7aa1011bc1d16193871"
     }
     Frame {
         msec: 352
-        hash: "26eed73af37b01ebecb4ee98ed9d67c6"
+        hash: "8a6b615ce522e7aa1011bc1d16193871"
     }
     Frame {
         msec: 368
-        hash: "26eed73af37b01ebecb4ee98ed9d67c6"
+        hash: "8a6b615ce522e7aa1011bc1d16193871"
     }
     Frame {
         msec: 384
-        hash: "26eed73af37b01ebecb4ee98ed9d67c6"
+        hash: "8a6b615ce522e7aa1011bc1d16193871"
     }
     Frame {
         msec: 400
-        hash: "26eed73af37b01ebecb4ee98ed9d67c6"
+        hash: "8a6b615ce522e7aa1011bc1d16193871"
     }
     Frame {
         msec: 416
-        hash: "26eed73af37b01ebecb4ee98ed9d67c6"
+        hash: "8a6b615ce522e7aa1011bc1d16193871"
     }
     Frame {
         msec: 432
-        hash: "26eed73af37b01ebecb4ee98ed9d67c6"
+        hash: "8a6b615ce522e7aa1011bc1d16193871"
     }
     Frame {
         msec: 448
-        hash: "26eed73af37b01ebecb4ee98ed9d67c6"
+        hash: "8a6b615ce522e7aa1011bc1d16193871"
     }
     Frame {
         msec: 464
-        hash: "26eed73af37b01ebecb4ee98ed9d67c6"
+        hash: "8a6b615ce522e7aa1011bc1d16193871"
     }
     Frame {
         msec: 480
-        hash: "26eed73af37b01ebecb4ee98ed9d67c6"
+        hash: "8a6b615ce522e7aa1011bc1d16193871"
     }
     Frame {
         msec: 496
-        hash: "f046b9aaa9f1eba08386a160e2f281ca"
+        hash: "17141b7167d2249238c15cf751b3d8b6"
     }
     Frame {
         msec: 512
-        hash: "f046b9aaa9f1eba08386a160e2f281ca"
+        hash: "17141b7167d2249238c15cf751b3d8b6"
     }
     Frame {
         msec: 528
-        hash: "f046b9aaa9f1eba08386a160e2f281ca"
+        hash: "17141b7167d2249238c15cf751b3d8b6"
     }
     Frame {
         msec: 544
-        hash: "f046b9aaa9f1eba08386a160e2f281ca"
+        hash: "17141b7167d2249238c15cf751b3d8b6"
     }
     Frame {
         msec: 560
-        hash: "f046b9aaa9f1eba08386a160e2f281ca"
+        hash: "17141b7167d2249238c15cf751b3d8b6"
     }
     Frame {
         msec: 576
-        hash: "f046b9aaa9f1eba08386a160e2f281ca"
+        hash: "17141b7167d2249238c15cf751b3d8b6"
     }
     Frame {
         msec: 592
-        hash: "f046b9aaa9f1eba08386a160e2f281ca"
+        hash: "17141b7167d2249238c15cf751b3d8b6"
     }
     Frame {
         msec: 608
-        hash: "f046b9aaa9f1eba08386a160e2f281ca"
+        hash: "17141b7167d2249238c15cf751b3d8b6"
     }
     Frame {
         msec: 624
-        hash: "f046b9aaa9f1eba08386a160e2f281ca"
+        hash: "17141b7167d2249238c15cf751b3d8b6"
     }
     Frame {
         msec: 640
-        hash: "f046b9aaa9f1eba08386a160e2f281ca"
+        hash: "17141b7167d2249238c15cf751b3d8b6"
     }
     Frame {
         msec: 656
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 672
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 688
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 704
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 720
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 736
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 752
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 768
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 784
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 800
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 816
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 832
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 848
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 864
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 880
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 896
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 912
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 928
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 944
-        hash: "52f90c22e44475fac04559164c044aee"
+        hash: "92e4f7c09e41b5fb97feb0093e8d9c1f"
     }
     Frame {
         msec: 960
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-MAC/parentanchor.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-MAC/parentanchor.qml
index 56527d1..d7428dd 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-MAC/parentanchor.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-MAC/parentanchor.qml
@@ -6,126 +6,126 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 32
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 48
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 64
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 80
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 96
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 112
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 128
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 144
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 160
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 176
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 192
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 208
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 224
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 240
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 256
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 272
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 288
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 304
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 320
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 336
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 352
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 368
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 384
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 400
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 416
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 432
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 448
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 464
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 480
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
     Frame {
         msec: 496
-        hash: "01ef07707e44ea079350128454209892"
+        hash: "80e9ca4c4ffac9c032334a3369ef9db6"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.0.png
index a947584..7547856 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.qml
index 940d3c1..6b9986f 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.qml
@@ -6,239 +6,239 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 32
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 48
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 64
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 80
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 96
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 112
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 128
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 144
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 160
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 176
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 192
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 208
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 224
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 240
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 256
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 272
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 288
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 304
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 320
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 336
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 352
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 368
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 384
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 400
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 416
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 432
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 448
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 464
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 480
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 496
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 512
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 528
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 544
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 560
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 576
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 592
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 608
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 624
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 640
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 656
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 672
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 688
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 704
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 720
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 736
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 752
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 768
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 784
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 800
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 816
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 832
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 848
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 864
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 880
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 896
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 912
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 928
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 944
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 960
@@ -246,15 +246,15 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 992
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 1008
-        hash: "f5b2ec4a5220eabe1186bb2fd65a7263"
+        hash: "35c278720fd30e14dce9cf8684dd2cd7"
     }
     Frame {
         msec: 1024
@@ -444,276 +444,4 @@ VisualTest {
         msec: 1760
         hash: "eee4600ac08b458ac7ac2320e225674c"
     }
-    Frame {
-        msec: 1776
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 1792
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 1808
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 1824
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 1840
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 1856
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 1872
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 1888
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 1904
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 1920
-        image: "qtbug_14865.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 1952
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 1968
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 1984
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2000
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2016
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2032
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2048
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2064
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2080
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2096
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2112
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2128
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2144
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2160
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2176
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2192
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2208
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2224
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2240
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2256
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2272
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2288
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2304
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2320
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2336
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2352
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2368
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2384
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2400
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2416
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2432
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2448
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2464
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2480
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2496
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2512
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2528
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2544
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2560
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2576
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2592
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2608
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2624
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2640
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2656
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2672
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2688
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2704
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2720
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2736
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2752
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2768
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2784
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2800
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
-    Frame {
-        msec: 2816
-        hash: "eee4600ac08b458ac7ac2320e225674c"
-    }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide.0.png
index 91ee2e5..88e065b 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide.0.png
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 718375a..96144e1 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: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 32
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 48
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 64
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 80
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 96
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 112
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 128
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 144
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 160
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 176
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 192
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 208
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 224
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 240
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 256
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 272
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 288
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 304
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 320
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 336
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 352
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 368
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 384
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 400
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 416
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 432
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 448
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 464
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 480
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 496
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 512
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 528
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 544
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 560
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 576
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 592
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 608
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 624
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 640
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 656
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 672
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 688
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 704
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 720
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 736
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 752
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 768
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 784
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 800
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 816
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 832
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 848
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 864
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 880
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 896
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 912
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 928
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 944
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 960
@@ -246,34 +246,34 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Key {
         type: 6
         key: 16777249
-        modifiers: 67108864
+        modifiers: 0
         text: ""
         autorep: false
         count: 1
     }
     Frame {
         msec: 992
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 1008
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 1024
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 1040
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
     Frame {
         msec: 1056
-        hash: "10e33a5f4c2161281d5a6b4481a17921"
+        hash: "7d056af7620fe8387955a1401a4f088a"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.0.png
index 0f9a0aa..4df514a 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.1.png
index f3bb7b9..e752fec 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.1.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.2.png
index b2f09de..d2f8633 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.2.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.2.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.3.png
index bca63db..0162321 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.3.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.3.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.qml
index 48a0ff4..b531942 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.qml
@@ -6,239 +6,239 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 32
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 48
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 64
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 80
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 96
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 112
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 128
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 144
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 160
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 176
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 192
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 208
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 224
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 240
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 256
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 272
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 288
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 304
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 320
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 336
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 352
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 368
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 384
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 400
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 416
-        hash: "083c607c9b66240f445611a18f3025b3"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 432
-        hash: "57993cfe25ba9e6f3dcdcea5fab6545c"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 448
-        hash: "57993cfe25ba9e6f3dcdcea5fab6545c"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 464
-        hash: "57993cfe25ba9e6f3dcdcea5fab6545c"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 480
-        hash: "45086d8e81c178855fc1e8fd283b7157"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 496
-        hash: "45086d8e81c178855fc1e8fd283b7157"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 512
-        hash: "45086d8e81c178855fc1e8fd283b7157"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 528
-        hash: "45086d8e81c178855fc1e8fd283b7157"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 544
-        hash: "45086d8e81c178855fc1e8fd283b7157"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 560
-        hash: "45086d8e81c178855fc1e8fd283b7157"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 576
-        hash: "c859ff5a516792a614008d0d3d096060"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 592
-        hash: "c859ff5a516792a614008d0d3d096060"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 608
-        hash: "c859ff5a516792a614008d0d3d096060"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 624
-        hash: "c859ff5a516792a614008d0d3d096060"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 640
-        hash: "c859ff5a516792a614008d0d3d096060"
+        hash: "90a45871fcfc509e60d4ee01527cde3b"
     }
     Frame {
         msec: 656
-        hash: "02d4eb733c7249f2c38c1768a9988739"
+        hash: "c73bf21c0c9946e123372c660c78e7dd"
     }
     Frame {
         msec: 672
-        hash: "02d4eb733c7249f2c38c1768a9988739"
+        hash: "c73bf21c0c9946e123372c660c78e7dd"
     }
     Frame {
         msec: 688
-        hash: "f87a38e5ef6cfe9d5c131671fecb7903"
+        hash: "c73bf21c0c9946e123372c660c78e7dd"
     }
     Frame {
         msec: 704
-        hash: "f87a38e5ef6cfe9d5c131671fecb7903"
+        hash: "bba29f9ce1a1d7dafdfe34b0ab952658"
     }
     Frame {
         msec: 720
-        hash: "f87a38e5ef6cfe9d5c131671fecb7903"
+        hash: "bba29f9ce1a1d7dafdfe34b0ab952658"
     }
     Frame {
         msec: 736
-        hash: "f87a38e5ef6cfe9d5c131671fecb7903"
+        hash: "bba29f9ce1a1d7dafdfe34b0ab952658"
     }
     Frame {
         msec: 752
-        hash: "f87a38e5ef6cfe9d5c131671fecb7903"
+        hash: "bba29f9ce1a1d7dafdfe34b0ab952658"
     }
     Frame {
         msec: 768
-        hash: "f87a38e5ef6cfe9d5c131671fecb7903"
+        hash: "bba29f9ce1a1d7dafdfe34b0ab952658"
     }
     Frame {
         msec: 784
-        hash: "3262cf6b60e56028056b81db17cfef61"
+        hash: "26f95496c4f1fa217d681a1ae79eff86"
     }
     Frame {
         msec: 800
-        hash: "3262cf6b60e56028056b81db17cfef61"
+        hash: "26f95496c4f1fa217d681a1ae79eff86"
     }
     Frame {
         msec: 816
-        hash: "3262cf6b60e56028056b81db17cfef61"
+        hash: "26f95496c4f1fa217d681a1ae79eff86"
     }
     Frame {
         msec: 832
-        hash: "31c337926e645ad93699a223c7ad223e"
+        hash: "26f95496c4f1fa217d681a1ae79eff86"
     }
     Frame {
         msec: 848
-        hash: "31c337926e645ad93699a223c7ad223e"
+        hash: "96a83eae50a073573ace90239a64d326"
     }
     Frame {
         msec: 864
-        hash: "31c337926e645ad93699a223c7ad223e"
+        hash: "96a83eae50a073573ace90239a64d326"
     }
     Frame {
         msec: 880
-        hash: "31c337926e645ad93699a223c7ad223e"
+        hash: "7b15d75c611f24977f2a1b44ef9e16d8"
     }
     Frame {
         msec: 896
-        hash: "31c337926e645ad93699a223c7ad223e"
+        hash: "7b15d75c611f24977f2a1b44ef9e16d8"
     }
     Frame {
         msec: 912
-        hash: "64253f08448ad6884b76271afe7831ab"
+        hash: "7b15d75c611f24977f2a1b44ef9e16d8"
     }
     Frame {
         msec: 928
-        hash: "64253f08448ad6884b76271afe7831ab"
+        hash: "7b15d75c611f24977f2a1b44ef9e16d8"
     }
     Frame {
         msec: 944
-        hash: "64253f08448ad6884b76271afe7831ab"
+        hash: "7b15d75c611f24977f2a1b44ef9e16d8"
     }
     Frame {
         msec: 960
@@ -246,247 +246,247 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "64253f08448ad6884b76271afe7831ab"
+        hash: "7b15d75c611f24977f2a1b44ef9e16d8"
     }
     Frame {
         msec: 992
-        hash: "f463cbd97856cd3cb0316cfbbc4c960f"
+        hash: "7b000cccb4e4cdaa53b025d235478b1c"
     }
     Frame {
         msec: 1008
-        hash: "f463cbd97856cd3cb0316cfbbc4c960f"
+        hash: "7b000cccb4e4cdaa53b025d235478b1c"
     }
     Frame {
         msec: 1024
-        hash: "06731429ea2d012364b2fd6177e4fcb1"
+        hash: "18366b01550fdd4a7dc7305a6289ac9b"
     }
     Frame {
         msec: 1040
-        hash: "06731429ea2d012364b2fd6177e4fcb1"
+        hash: "18366b01550fdd4a7dc7305a6289ac9b"
     }
     Frame {
         msec: 1056
-        hash: "06731429ea2d012364b2fd6177e4fcb1"
+        hash: "18366b01550fdd4a7dc7305a6289ac9b"
     }
     Frame {
         msec: 1072
-        hash: "06731429ea2d012364b2fd6177e4fcb1"
+        hash: "18366b01550fdd4a7dc7305a6289ac9b"
     }
     Frame {
         msec: 1088
-        hash: "06731429ea2d012364b2fd6177e4fcb1"
+        hash: "18366b01550fdd4a7dc7305a6289ac9b"
     }
     Frame {
         msec: 1104
-        hash: "a3f1acd84b5fc99e8ffa3c900013ca0d"
+        hash: "cde86069e7f9809ef2c88cc6ea83910b"
     }
     Frame {
         msec: 1120
-        hash: "a3f1acd84b5fc99e8ffa3c900013ca0d"
+        hash: "cde86069e7f9809ef2c88cc6ea83910b"
     }
     Frame {
         msec: 1136
-        hash: "a3f1acd84b5fc99e8ffa3c900013ca0d"
+        hash: "cde86069e7f9809ef2c88cc6ea83910b"
     }
     Frame {
         msec: 1152
-        hash: "2cb79791e784739b5c4a12578df47205"
+        hash: "cde86069e7f9809ef2c88cc6ea83910b"
     }
     Frame {
         msec: 1168
-        hash: "2cb79791e784739b5c4a12578df47205"
+        hash: "b8c7416944cb741ceb4ee0e8545037b1"
     }
     Frame {
         msec: 1184
-        hash: "2cb79791e784739b5c4a12578df47205"
+        hash: "b8c7416944cb741ceb4ee0e8545037b1"
     }
     Frame {
         msec: 1200
-        hash: "c040d9e9494193164206890e8dd79508"
+        hash: "b8c7416944cb741ceb4ee0e8545037b1"
     }
     Frame {
         msec: 1216
-        hash: "c040d9e9494193164206890e8dd79508"
+        hash: "74a03bf98bb205d7962e0fcc025c4ed3"
     }
     Frame {
         msec: 1232
-        hash: "c040d9e9494193164206890e8dd79508"
+        hash: "74a03bf98bb205d7962e0fcc025c4ed3"
     }
     Frame {
         msec: 1248
-        hash: "daaa92c4049a1ef9d290d99b0c83306e"
+        hash: "74a03bf98bb205d7962e0fcc025c4ed3"
     }
     Frame {
         msec: 1264
-        hash: "daaa92c4049a1ef9d290d99b0c83306e"
+        hash: "74a03bf98bb205d7962e0fcc025c4ed3"
     }
     Frame {
         msec: 1280
-        hash: "daaa92c4049a1ef9d290d99b0c83306e"
+        hash: "0d286d7e274868e87f7de4367b69386e"
     }
     Frame {
         msec: 1296
-        hash: "daaa92c4049a1ef9d290d99b0c83306e"
+        hash: "0d286d7e274868e87f7de4367b69386e"
     }
     Frame {
         msec: 1312
-        hash: "daaa92c4049a1ef9d290d99b0c83306e"
+        hash: "892e9e8feeb15bbad5f38cb354aa7290"
     }
     Frame {
         msec: 1328
-        hash: "afedb8f328ae31f2e5d68cd917d652ff"
+        hash: "892e9e8feeb15bbad5f38cb354aa7290"
     }
     Frame {
         msec: 1344
-        hash: "afedb8f328ae31f2e5d68cd917d652ff"
+        hash: "892e9e8feeb15bbad5f38cb354aa7290"
     }
     Frame {
         msec: 1360
-        hash: "afedb8f328ae31f2e5d68cd917d652ff"
+        hash: "06d6ad94b01af5b441fd64536f7740ff"
     }
     Frame {
         msec: 1376
-        hash: "afedb8f328ae31f2e5d68cd917d652ff"
+        hash: "06d6ad94b01af5b441fd64536f7740ff"
     }
     Frame {
         msec: 1392
-        hash: "afedb8f328ae31f2e5d68cd917d652ff"
+        hash: "06d6ad94b01af5b441fd64536f7740ff"
     }
     Frame {
         msec: 1408
-        hash: "1a7c95dcd5dd375a01179626d3e1bb4b"
+        hash: "0552844f7915835d3a35a01137d4c310"
     }
     Frame {
         msec: 1424
-        hash: "1a7c95dcd5dd375a01179626d3e1bb4b"
+        hash: "0552844f7915835d3a35a01137d4c310"
     }
     Frame {
         msec: 1440
-        hash: "1a7c95dcd5dd375a01179626d3e1bb4b"
+        hash: "0552844f7915835d3a35a01137d4c310"
     }
     Frame {
         msec: 1456
-        hash: "1a7c95dcd5dd375a01179626d3e1bb4b"
+        hash: "0552844f7915835d3a35a01137d4c310"
     }
     Frame {
         msec: 1472
-        hash: "1a7c95dcd5dd375a01179626d3e1bb4b"
+        hash: "0552844f7915835d3a35a01137d4c310"
     }
     Frame {
         msec: 1488
-        hash: "79e56686d52dad27374fe45933f7e045"
+        hash: "afdf5d4d9e49a82a395afad6b3fe4f86"
     }
     Frame {
         msec: 1504
-        hash: "79e56686d52dad27374fe45933f7e045"
+        hash: "afdf5d4d9e49a82a395afad6b3fe4f86"
     }
     Frame {
         msec: 1520
-        hash: "79e56686d52dad27374fe45933f7e045"
+        hash: "afdf5d4d9e49a82a395afad6b3fe4f86"
     }
     Frame {
         msec: 1536
-        hash: "79e56686d52dad27374fe45933f7e045"
+        hash: "afdf5d4d9e49a82a395afad6b3fe4f86"
     }
     Frame {
         msec: 1552
-        hash: "79e56686d52dad27374fe45933f7e045"
+        hash: "bb434e586d40ae0ebcb89cde55a4ca11"
     }
     Frame {
         msec: 1568
-        hash: "79e56686d52dad27374fe45933f7e045"
+        hash: "bb434e586d40ae0ebcb89cde55a4ca11"
     }
     Frame {
         msec: 1584
-        hash: "ad8f8e33731a8861016c3c9567419fff"
+        hash: "bb434e586d40ae0ebcb89cde55a4ca11"
     }
     Frame {
         msec: 1600
-        hash: "ad8f8e33731a8861016c3c9567419fff"
+        hash: "bb434e586d40ae0ebcb89cde55a4ca11"
     }
     Frame {
         msec: 1616
-        hash: "ad8f8e33731a8861016c3c9567419fff"
+        hash: "bb434e586d40ae0ebcb89cde55a4ca11"
     }
     Frame {
         msec: 1632
-        hash: "609e9d64c3e376b37cf0833333d57a0b"
+        hash: "771561a07b3eb2396231b17343da7125"
     }
     Frame {
         msec: 1648
-        hash: "609e9d64c3e376b37cf0833333d57a0b"
+        hash: "771561a07b3eb2396231b17343da7125"
     }
     Frame {
         msec: 1664
-        hash: "609e9d64c3e376b37cf0833333d57a0b"
+        hash: "771561a07b3eb2396231b17343da7125"
     }
     Frame {
         msec: 1680
-        hash: "609e9d64c3e376b37cf0833333d57a0b"
+        hash: "771561a07b3eb2396231b17343da7125"
     }
     Frame {
         msec: 1696
-        hash: "f3a64e17c082529f753292a722a2b3e8"
+        hash: "771561a07b3eb2396231b17343da7125"
     }
     Frame {
         msec: 1712
-        hash: "f3a64e17c082529f753292a722a2b3e8"
+        hash: "771561a07b3eb2396231b17343da7125"
     }
     Frame {
         msec: 1728
-        hash: "f3a64e17c082529f753292a722a2b3e8"
+        hash: "d3d23db79c5f2a374b267bcda8919d1e"
     }
     Frame {
         msec: 1744
-        hash: "76627f7257d24b08a9011c806d4c8458"
+        hash: "d3d23db79c5f2a374b267bcda8919d1e"
     }
     Key {
         type: 6
         key: 16777249
-        modifiers: 67108864
+        modifiers: 0
         text: ""
         autorep: false
         count: 1
     }
     Frame {
         msec: 1760
-        hash: "76627f7257d24b08a9011c806d4c8458"
+        hash: "36a40dbdbb39122d30c26643e5924548"
     }
     Frame {
         msec: 1776
-        hash: "76627f7257d24b08a9011c806d4c8458"
+        hash: "36a40dbdbb39122d30c26643e5924548"
     }
     Frame {
         msec: 1792
-        hash: "76627f7257d24b08a9011c806d4c8458"
+        hash: "36a40dbdbb39122d30c26643e5924548"
     }
     Frame {
         msec: 1808
-        hash: "4275796ca36c974f6ba7ba2fc7c3d68f"
+        hash: "36a40dbdbb39122d30c26643e5924548"
     }
     Frame {
         msec: 1824
-        hash: "4275796ca36c974f6ba7ba2fc7c3d68f"
+        hash: "36a40dbdbb39122d30c26643e5924548"
     }
     Frame {
         msec: 1840
-        hash: "4275796ca36c974f6ba7ba2fc7c3d68f"
+        hash: "6a202f32d3d7a7c9edc97e55c2fe7aca"
     }
     Frame {
         msec: 1856
-        hash: "4275796ca36c974f6ba7ba2fc7c3d68f"
+        hash: "6a202f32d3d7a7c9edc97e55c2fe7aca"
     }
     Frame {
         msec: 1872
-        hash: "4275796ca36c974f6ba7ba2fc7c3d68f"
+        hash: "6a202f32d3d7a7c9edc97e55c2fe7aca"
     }
     Frame {
         msec: 1888
-        hash: "9005e33c220aaadb6c1b756c496140b5"
+        hash: "765b11a4fff9a7295440568899107159"
     }
     Frame {
         msec: 1904
-        hash: "9005e33c220aaadb6c1b756c496140b5"
+        hash: "765b11a4fff9a7295440568899107159"
     }
     Frame {
         msec: 1920
@@ -494,239 +494,239 @@ VisualTest {
     }
     Frame {
         msec: 1936
-        hash: "9005e33c220aaadb6c1b756c496140b5"
+        hash: "765b11a4fff9a7295440568899107159"
     }
     Frame {
         msec: 1952
-        hash: "9005e33c220aaadb6c1b756c496140b5"
+        hash: "765b11a4fff9a7295440568899107159"
     }
     Frame {
         msec: 1968
-        hash: "1664ce25b0e427b89e64c00668797dc1"
+        hash: "e2726e028d0a17a918a28d248a087d71"
     }
     Frame {
         msec: 1984
-        hash: "1664ce25b0e427b89e64c00668797dc1"
+        hash: "e2726e028d0a17a918a28d248a087d71"
     }
     Frame {
         msec: 2000
-        hash: "1664ce25b0e427b89e64c00668797dc1"
+        hash: "e2726e028d0a17a918a28d248a087d71"
     }
     Frame {
         msec: 2016
-        hash: "1664ce25b0e427b89e64c00668797dc1"
+        hash: "e2726e028d0a17a918a28d248a087d71"
     }
     Frame {
         msec: 2032
-        hash: "1664ce25b0e427b89e64c00668797dc1"
+        hash: "94243dc2a8013e86250c993103b2d789"
     }
     Frame {
         msec: 2048
-        hash: "4421ad90c93cca320b790c0432745a5e"
+        hash: "94243dc2a8013e86250c993103b2d789"
     }
     Frame {
         msec: 2064
-        hash: "4421ad90c93cca320b790c0432745a5e"
+        hash: "94243dc2a8013e86250c993103b2d789"
     }
     Frame {
         msec: 2080
-        hash: "4421ad90c93cca320b790c0432745a5e"
+        hash: "94243dc2a8013e86250c993103b2d789"
     }
     Frame {
         msec: 2096
-        hash: "c21285318beec99e9afd1dde46a5497b"
+        hash: "94243dc2a8013e86250c993103b2d789"
     }
     Frame {
         msec: 2112
-        hash: "c21285318beec99e9afd1dde46a5497b"
+        hash: "d8fdababa06e1cafa9047de16d5a07b5"
     }
     Frame {
         msec: 2128
-        hash: "c21285318beec99e9afd1dde46a5497b"
+        hash: "d8fdababa06e1cafa9047de16d5a07b5"
     }
     Frame {
         msec: 2144
-        hash: "ec4f44aa4f4b7de7e597cab376c1f82f"
+        hash: "d8fdababa06e1cafa9047de16d5a07b5"
     }
     Frame {
         msec: 2160
-        hash: "ec4f44aa4f4b7de7e597cab376c1f82f"
+        hash: "d8fdababa06e1cafa9047de16d5a07b5"
     }
     Frame {
         msec: 2176
-        hash: "ec4f44aa4f4b7de7e597cab376c1f82f"
+        hash: "d8fdababa06e1cafa9047de16d5a07b5"
     }
     Frame {
         msec: 2192
-        hash: "ad984149e44b3be55e420b1be3c0b8c3"
+        hash: "f31d3f99faff3289b38ec91a43108707"
     }
     Frame {
         msec: 2208
-        hash: "ad984149e44b3be55e420b1be3c0b8c3"
+        hash: "f31d3f99faff3289b38ec91a43108707"
     }
     Frame {
         msec: 2224
-        hash: "ad984149e44b3be55e420b1be3c0b8c3"
+        hash: "f31d3f99faff3289b38ec91a43108707"
     }
     Frame {
         msec: 2240
-        hash: "ad984149e44b3be55e420b1be3c0b8c3"
+        hash: "60468f768e70c91cd28dca9479ed7738"
     }
     Frame {
         msec: 2256
-        hash: "ad984149e44b3be55e420b1be3c0b8c3"
+        hash: "60468f768e70c91cd28dca9479ed7738"
     }
     Frame {
         msec: 2272
-        hash: "cd016ce04572119cf89263091ae55b2f"
+        hash: "fd5e8714cdd406f5626682c15a6efa38"
     }
     Frame {
         msec: 2288
-        hash: "cd016ce04572119cf89263091ae55b2f"
+        hash: "fd5e8714cdd406f5626682c15a6efa38"
     }
     Frame {
         msec: 2304
-        hash: "e621ae81e0da861323efe03d1a6f2ac4"
+        hash: "fd5e8714cdd406f5626682c15a6efa38"
     }
     Frame {
         msec: 2320
-        hash: "e621ae81e0da861323efe03d1a6f2ac4"
+        hash: "20f37569f7f3b374753b991b28d98e74"
     }
     Frame {
         msec: 2336
-        hash: "e621ae81e0da861323efe03d1a6f2ac4"
+        hash: "20f37569f7f3b374753b991b28d98e74"
     }
     Frame {
         msec: 2352
-        hash: "e621ae81e0da861323efe03d1a6f2ac4"
+        hash: "20f37569f7f3b374753b991b28d98e74"
     }
     Frame {
         msec: 2368
-        hash: "e621ae81e0da861323efe03d1a6f2ac4"
+        hash: "20f37569f7f3b374753b991b28d98e74"
     }
     Frame {
         msec: 2384
-        hash: "b9f9502b8acbd59927b78104dc39b3ea"
+        hash: "20f37569f7f3b374753b991b28d98e74"
     }
     Frame {
         msec: 2400
-        hash: "b9f9502b8acbd59927b78104dc39b3ea"
+        hash: "8ab72206d4ba87effd44844c67ab4d53"
     }
     Frame {
         msec: 2416
-        hash: "b9f9502b8acbd59927b78104dc39b3ea"
+        hash: "8ab72206d4ba87effd44844c67ab4d53"
     }
     Frame {
         msec: 2432
-        hash: "b9f9502b8acbd59927b78104dc39b3ea"
+        hash: "65fccdd3a8803ec1d70a12407366fb57"
     }
     Frame {
         msec: 2448
-        hash: "b9f9502b8acbd59927b78104dc39b3ea"
+        hash: "65fccdd3a8803ec1d70a12407366fb57"
     }
     Frame {
         msec: 2464
-        hash: "69bc7470ddd917ec73a075ba16715ccf"
+        hash: "65fccdd3a8803ec1d70a12407366fb57"
     }
     Frame {
         msec: 2480
-        hash: "69bc7470ddd917ec73a075ba16715ccf"
+        hash: "65fccdd3a8803ec1d70a12407366fb57"
     }
     Frame {
         msec: 2496
-        hash: "69bc7470ddd917ec73a075ba16715ccf"
+        hash: "65fccdd3a8803ec1d70a12407366fb57"
     }
     Frame {
         msec: 2512
-        hash: "69bc7470ddd917ec73a075ba16715ccf"
+        hash: "ea98cc56d2f402814d8c1b952c8bd9a0"
     }
     Frame {
         msec: 2528
-        hash: "69bc7470ddd917ec73a075ba16715ccf"
+        hash: "ea98cc56d2f402814d8c1b952c8bd9a0"
     }
     Frame {
         msec: 2544
-        hash: "9d2d1ad3db3f80ffc6fcd321a4f5adfa"
+        hash: "ea98cc56d2f402814d8c1b952c8bd9a0"
     }
     Frame {
         msec: 2560
-        hash: "9d2d1ad3db3f80ffc6fcd321a4f5adfa"
+        hash: "ea98cc56d2f402814d8c1b952c8bd9a0"
     }
     Frame {
         msec: 2576
-        hash: "9d2d1ad3db3f80ffc6fcd321a4f5adfa"
+        hash: "6dd6532db6afba17d36930bfd71abb5d"
     }
     Frame {
         msec: 2592
-        hash: "9d2d1ad3db3f80ffc6fcd321a4f5adfa"
+        hash: "6dd6532db6afba17d36930bfd71abb5d"
     }
     Frame {
         msec: 2608
-        hash: "c82742c641c411df5d9ecb4d19b7a30d"
+        hash: "6dd6532db6afba17d36930bfd71abb5d"
     }
     Frame {
         msec: 2624
-        hash: "c82742c641c411df5d9ecb4d19b7a30d"
+        hash: "6dd6532db6afba17d36930bfd71abb5d"
     }
     Frame {
         msec: 2640
-        hash: "c82742c641c411df5d9ecb4d19b7a30d"
+        hash: "6dd6532db6afba17d36930bfd71abb5d"
     }
     Frame {
         msec: 2656
-        hash: "ae50d41ef5289fc31b5cd18462905379"
+        hash: "70989ac02176a37beb2cf259cd2d9770"
     }
     Frame {
         msec: 2672
-        hash: "ae50d41ef5289fc31b5cd18462905379"
+        hash: "70989ac02176a37beb2cf259cd2d9770"
     }
     Frame {
         msec: 2688
-        hash: "ae50d41ef5289fc31b5cd18462905379"
+        hash: "70989ac02176a37beb2cf259cd2d9770"
     }
     Frame {
         msec: 2704
-        hash: "ae50d41ef5289fc31b5cd18462905379"
+        hash: "70989ac02176a37beb2cf259cd2d9770"
     }
     Frame {
         msec: 2720
-        hash: "38d393df298826121109b6bd2d454bc0"
+        hash: "1c6d8786cb42afa2af611dec5ebdcda7"
     }
     Frame {
         msec: 2736
-        hash: "38d393df298826121109b6bd2d454bc0"
+        hash: "1c6d8786cb42afa2af611dec5ebdcda7"
     }
     Frame {
         msec: 2752
-        hash: "38d393df298826121109b6bd2d454bc0"
+        hash: "3e8215d2cb61404230284ddd0041a79c"
     }
     Frame {
         msec: 2768
-        hash: "38d393df298826121109b6bd2d454bc0"
+        hash: "3e8215d2cb61404230284ddd0041a79c"
     }
     Frame {
         msec: 2784
-        hash: "38d393df298826121109b6bd2d454bc0"
+        hash: "3e8215d2cb61404230284ddd0041a79c"
     }
     Frame {
         msec: 2800
-        hash: "38d393df298826121109b6bd2d454bc0"
+        hash: "3e8215d2cb61404230284ddd0041a79c"
     }
     Frame {
         msec: 2816
-        hash: "38d393df298826121109b6bd2d454bc0"
+        hash: "3e8215d2cb61404230284ddd0041a79c"
     }
     Frame {
         msec: 2832
-        hash: "50a47e20ff34a2935b1dde36c85f7f54"
+        hash: "a4ed37665222950eab7fcb53dbe22bcf"
     }
     Frame {
         msec: 2848
-        hash: "50a47e20ff34a2935b1dde36c85f7f54"
+        hash: "a4ed37665222950eab7fcb53dbe22bcf"
     }
     Frame {
         msec: 2864
-        hash: "4daa350f9385217b9eef714f40b4e6d0"
+        hash: "a4ed37665222950eab7fcb53dbe22bcf"
     }
     Frame {
         msec: 2880
@@ -734,239 +734,239 @@ VisualTest {
     }
     Frame {
         msec: 2896
-        hash: "4daa350f9385217b9eef714f40b4e6d0"
+        hash: "a4ed37665222950eab7fcb53dbe22bcf"
     }
     Frame {
         msec: 2912
-        hash: "0e36ea4104aa509455555796262ea30d"
+        hash: "a4ed37665222950eab7fcb53dbe22bcf"
     }
     Frame {
         msec: 2928
-        hash: "0e36ea4104aa509455555796262ea30d"
+        hash: "a7f26f5fbcc97f408974e4bc23fd0b70"
     }
     Frame {
         msec: 2944
-        hash: "0e36ea4104aa509455555796262ea30d"
+        hash: "a7f26f5fbcc97f408974e4bc23fd0b70"
     }
     Frame {
         msec: 2960
-        hash: "0e36ea4104aa509455555796262ea30d"
+        hash: "913478b8d5d05967efd1c83e80e773e2"
     }
     Frame {
         msec: 2976
-        hash: "0e36ea4104aa509455555796262ea30d"
+        hash: "913478b8d5d05967efd1c83e80e773e2"
     }
     Frame {
         msec: 2992
-        hash: "4dd59519884c4aa19834430b2b0a3040"
+        hash: "913478b8d5d05967efd1c83e80e773e2"
     }
     Frame {
         msec: 3008
-        hash: "4dd59519884c4aa19834430b2b0a3040"
+        hash: "130749caf262b3055e7ac229b6b89548"
     }
     Frame {
         msec: 3024
-        hash: "4dd59519884c4aa19834430b2b0a3040"
+        hash: "130749caf262b3055e7ac229b6b89548"
     }
     Frame {
         msec: 3040
-        hash: "4dd59519884c4aa19834430b2b0a3040"
+        hash: "130749caf262b3055e7ac229b6b89548"
     }
     Frame {
         msec: 3056
-        hash: "4dd59519884c4aa19834430b2b0a3040"
+        hash: "130749caf262b3055e7ac229b6b89548"
     }
     Frame {
         msec: 3072
-        hash: "5e2e943b2ab6f798660b32e132ec6bef"
+        hash: "130749caf262b3055e7ac229b6b89548"
     }
     Frame {
         msec: 3088
-        hash: "5e2e943b2ab6f798660b32e132ec6bef"
+        hash: "d7260d913c58065a671ff6b931bb2fb6"
     }
     Frame {
         msec: 3104
-        hash: "5e2e943b2ab6f798660b32e132ec6bef"
+        hash: "d7260d913c58065a671ff6b931bb2fb6"
     }
     Frame {
         msec: 3120
-        hash: "a64b8d6bae4b6445d5de78b126e3af63"
+        hash: "d7260d913c58065a671ff6b931bb2fb6"
     }
     Frame {
         msec: 3136
-        hash: "a64b8d6bae4b6445d5de78b126e3af63"
+        hash: "d7260d913c58065a671ff6b931bb2fb6"
     }
     Frame {
         msec: 3152
-        hash: "8732d4c3b6ea276079794d2c892d14a9"
+        hash: "9059402dce5cb1813af8f7ebbd831bca"
     }
     Frame {
         msec: 3168
-        hash: "8732d4c3b6ea276079794d2c892d14a9"
+        hash: "9059402dce5cb1813af8f7ebbd831bca"
     }
     Frame {
         msec: 3184
-        hash: "8732d4c3b6ea276079794d2c892d14a9"
+        hash: "9059402dce5cb1813af8f7ebbd831bca"
     }
     Frame {
         msec: 3200
-        hash: "931f767d8c733d2262b8c73003629fd1"
+        hash: "80387fc8aedc0c490c689c3a1711fe9f"
     }
     Frame {
         msec: 3216
-        hash: "931f767d8c733d2262b8c73003629fd1"
+        hash: "80387fc8aedc0c490c689c3a1711fe9f"
     }
     Frame {
         msec: 3232
-        hash: "931f767d8c733d2262b8c73003629fd1"
+        hash: "80387fc8aedc0c490c689c3a1711fe9f"
     }
     Frame {
         msec: 3248
-        hash: "931f767d8c733d2262b8c73003629fd1"
+        hash: "f461bf58cbfd345a3f4e087cfcb0e9f0"
     }
     Frame {
         msec: 3264
-        hash: "931f767d8c733d2262b8c73003629fd1"
+        hash: "f461bf58cbfd345a3f4e087cfcb0e9f0"
     }
     Frame {
         msec: 3280
-        hash: "526f7d87bdce834a8d4396df4406d4c7"
+        hash: "d41a792b81cb891a91f2bff6dbee3bdd"
     }
     Frame {
         msec: 3296
-        hash: "526f7d87bdce834a8d4396df4406d4c7"
+        hash: "d41a792b81cb891a91f2bff6dbee3bdd"
     }
     Frame {
         msec: 3312
-        hash: "526f7d87bdce834a8d4396df4406d4c7"
+        hash: "d41a792b81cb891a91f2bff6dbee3bdd"
     }
     Frame {
         msec: 3328
-        hash: "526f7d87bdce834a8d4396df4406d4c7"
+        hash: "d41a792b81cb891a91f2bff6dbee3bdd"
     }
     Frame {
         msec: 3344
-        hash: "526f7d87bdce834a8d4396df4406d4c7"
+        hash: "d41a792b81cb891a91f2bff6dbee3bdd"
     }
     Frame {
         msec: 3360
-        hash: "0c9bb37ebb01a6127b60d26792cc3524"
+        hash: "664ac430dd416e6d1ed7e001458202cf"
     }
     Frame {
         msec: 3376
-        hash: "0c9bb37ebb01a6127b60d26792cc3524"
+        hash: "664ac430dd416e6d1ed7e001458202cf"
     }
     Frame {
         msec: 3392
-        hash: "0c9bb37ebb01a6127b60d26792cc3524"
+        hash: "664ac430dd416e6d1ed7e001458202cf"
     }
     Frame {
         msec: 3408
-        hash: "04b580975c168ef07b11496a18b55582"
+        hash: "664ac430dd416e6d1ed7e001458202cf"
     }
     Frame {
         msec: 3424
-        hash: "04b580975c168ef07b11496a18b55582"
+        hash: "664ac430dd416e6d1ed7e001458202cf"
     }
     Frame {
         msec: 3440
-        hash: "c4abe8e74b0a0a61ee671b4d7047b244"
+        hash: "c7a9e47b613745858a76a57e1782b566"
     }
     Frame {
         msec: 3456
-        hash: "c4abe8e74b0a0a61ee671b4d7047b244"
+        hash: "c7a9e47b613745858a76a57e1782b566"
     }
     Frame {
         msec: 3472
-        hash: "c4abe8e74b0a0a61ee671b4d7047b244"
+        hash: "b90d46cbd9d7d1d82cb9abfbe27fc549"
     }
     Frame {
         msec: 3488
-        hash: "c4abe8e74b0a0a61ee671b4d7047b244"
+        hash: "b90d46cbd9d7d1d82cb9abfbe27fc549"
     }
     Frame {
         msec: 3504
-        hash: "c4abe8e74b0a0a61ee671b4d7047b244"
+        hash: "b90d46cbd9d7d1d82cb9abfbe27fc549"
     }
     Frame {
         msec: 3520
-        hash: "c4abe8e74b0a0a61ee671b4d7047b244"
+        hash: "59c03ceae9b13576bd0e285234dfe264"
     }
     Frame {
         msec: 3536
-        hash: "179c36c797dfd91fdc6bd373f5331cbb"
+        hash: "59c03ceae9b13576bd0e285234dfe264"
     }
     Frame {
         msec: 3552
-        hash: "179c36c797dfd91fdc6bd373f5331cbb"
+        hash: "59c03ceae9b13576bd0e285234dfe264"
     }
     Frame {
         msec: 3568
-        hash: "179c36c797dfd91fdc6bd373f5331cbb"
+        hash: "59c03ceae9b13576bd0e285234dfe264"
     }
     Frame {
         msec: 3584
-        hash: "179c36c797dfd91fdc6bd373f5331cbb"
+        hash: "59c03ceae9b13576bd0e285234dfe264"
     }
     Frame {
         msec: 3600
-        hash: "179c36c797dfd91fdc6bd373f5331cbb"
+        hash: "b883d12eea2ec596cb6ee81f2d1db35f"
     }
     Frame {
         msec: 3616
-        hash: "49b9d5168c3fa5e09953251ffb509743"
+        hash: "b883d12eea2ec596cb6ee81f2d1db35f"
     }
     Frame {
         msec: 3632
-        hash: "49b9d5168c3fa5e09953251ffb509743"
+        hash: "b883d12eea2ec596cb6ee81f2d1db35f"
     }
     Frame {
         msec: 3648
-        hash: "49b9d5168c3fa5e09953251ffb509743"
+        hash: "b883d12eea2ec596cb6ee81f2d1db35f"
     }
     Frame {
         msec: 3664
-        hash: "49b9d5168c3fa5e09953251ffb509743"
+        hash: "9bd66e03c36c8cc279c9cfb1ea9e96a0"
     }
     Frame {
         msec: 3680
-        hash: "49b9d5168c3fa5e09953251ffb509743"
+        hash: "9bd66e03c36c8cc279c9cfb1ea9e96a0"
     }
     Frame {
         msec: 3696
-        hash: "da74be0adb46300cac7ba9bfe3660c33"
+        hash: "9bd66e03c36c8cc279c9cfb1ea9e96a0"
     }
     Frame {
         msec: 3712
-        hash: "da74be0adb46300cac7ba9bfe3660c33"
+        hash: "9bd66e03c36c8cc279c9cfb1ea9e96a0"
     }
     Frame {
         msec: 3728
-        hash: "9276749ab90c7da1eb62c6277613f75a"
+        hash: "9bd66e03c36c8cc279c9cfb1ea9e96a0"
     }
     Frame {
         msec: 3744
-        hash: "9276749ab90c7da1eb62c6277613f75a"
+        hash: "ee357c3850d0f328db859e7b790bed83"
     }
     Frame {
         msec: 3760
-        hash: "b85b7f367d4da5bd01fe87a292a356fd"
+        hash: "ee357c3850d0f328db859e7b790bed83"
     }
     Frame {
         msec: 3776
-        hash: "b85b7f367d4da5bd01fe87a292a356fd"
+        hash: "f706095272153c1e9fc4a4825ba54d91"
     }
     Frame {
         msec: 3792
-        hash: "b85b7f367d4da5bd01fe87a292a356fd"
+        hash: "f706095272153c1e9fc4a4825ba54d91"
     }
     Frame {
         msec: 3808
-        hash: "b85b7f367d4da5bd01fe87a292a356fd"
+        hash: "34f4d03164469f99bb7bcb365041cf8e"
     }
     Frame {
         msec: 3824
-        hash: "b85b7f367d4da5bd01fe87a292a356fd"
+        hash: "34f4d03164469f99bb7bcb365041cf8e"
     }
     Frame {
         msec: 3840
@@ -974,18 +974,18 @@ VisualTest {
     }
     Frame {
         msec: 3856
-        hash: "e871d5f9d6437154ef85a60fe5a6a08e"
+        hash: "34f4d03164469f99bb7bcb365041cf8e"
     }
     Frame {
         msec: 3872
-        hash: "e871d5f9d6437154ef85a60fe5a6a08e"
+        hash: "34f4d03164469f99bb7bcb365041cf8e"
     }
     Frame {
         msec: 3888
-        hash: "f66f5d470e913f4bec6c8982702b8a60"
+        hash: "97cb5f52e1a5e82a15542b7e5f772fba"
     }
     Frame {
         msec: 3904
-        hash: "f66f5d470e913f4bec6c8982702b8a60"
+        hash: "97cb5f52e1a5e82a15542b7e5f772fba"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/multilength.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/multilength.0.png
index 944208b..8caaf5f 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/multilength.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/multilength.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/multilength.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/multilength.qml
index e76ad11..30df3fa 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/multilength.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/multilength.qml
@@ -6,239 +6,239 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "fa4edc25cc530be81c5c18c089c76643"
+        hash: "2e258ad7cb0a2cd7c6c47a0b0a9563c1"
     }
     Frame {
         msec: 32
-        hash: "d543f734101d89c6d4e4a5992bd34cb3"
+        hash: "d818e0f4f1011a2a8f1d0d803fa18bc0"
     }
     Frame {
         msec: 48
-        hash: "fc96f61ab3f8235d96c815f8876728f5"
+        hash: "44b37be97bbd1f0e26d81f76d9643e51"
     }
     Frame {
         msec: 64
-        hash: "0bdeb73a4cfbe216ca795756baa353c8"
+        hash: "3079a5cf6b8277ae3e1b29ae09d04adc"
     }
     Frame {
         msec: 80
-        hash: "4451049db7f7d0b62325af6d27073f16"
+        hash: "ba899e6f18abb7105f915cef4e60f1e1"
     }
     Frame {
         msec: 96
-        hash: "ef51f1424db831f962960e468b547cc5"
+        hash: "6d2d2b3dc8afa60e32a39449ba90f78d"
     }
     Frame {
         msec: 112
-        hash: "c79ffb52d5aa11e2ee99e9db57c58c3e"
+        hash: "965af350a8fc20c7bcffb370802bc9d9"
     }
     Frame {
         msec: 128
-        hash: "3827b0ca877b214ceffdc7444f9eae14"
+        hash: "8e088db1ff0eb9f5c28268dee929928c"
     }
     Frame {
         msec: 144
-        hash: "8e375f05606f04f81c2ff0551ce7a290"
+        hash: "a0ba6c6bd1e491778294346eeabd8138"
     }
     Frame {
         msec: 160
-        hash: "8d48743f9d3c02cdb342c57b080ab52a"
+        hash: "068a018a5c017cb76ebf3721e0acdb35"
     }
     Frame {
         msec: 176
-        hash: "a8d1cae0e817ca059a73594f35eeccaf"
+        hash: "efa65cae0a4d027c2ec508deecef8aa5"
     }
     Frame {
         msec: 192
-        hash: "71d024907815100b5ea74e072e167384"
+        hash: "9c224e97aa56c6b203a48fb689d72c9a"
     }
     Frame {
         msec: 208
-        hash: "8f294501a7d0dff60233c922161f0b8d"
+        hash: "4f78af1e82a2dd46bab2d237d4f574e5"
     }
     Frame {
         msec: 224
-        hash: "303deae49dd99baba31af8915dd43d4d"
+        hash: "7d022c13e3ef07ca0b6618ae8865dbf1"
     }
     Frame {
         msec: 240
-        hash: "41f34af1ca4417e546d40057727a24b8"
+        hash: "1dc2ecf6cb92cd7d9e467de0049a8598"
     }
     Frame {
         msec: 256
-        hash: "baf5102132a01cb44925f7fc1532f8fb"
+        hash: "262174926ac657c3cd788e2383b5842b"
     }
     Frame {
         msec: 272
-        hash: "559c5e92b2cc8f20c2289bdabc7d2a3c"
+        hash: "984c40aaa927f9e9e73ad228f057d3d9"
     }
     Frame {
         msec: 288
-        hash: "39a50d44ae47e6c358d6ebaa2234cbfb"
+        hash: "0c74101beaeb0a59c1e6b1bf751ca71d"
     }
     Frame {
         msec: 304
-        hash: "4bdfe9e04c2ee21a584dc7612603fe62"
+        hash: "1c2dd6a6675014255e83c2ae734d717b"
     }
     Frame {
         msec: 320
-        hash: "e3ff2c98c9309964ccc612c4499817ff"
+        hash: "f6ac3e9e82a9a710f500f8053b6030ac"
     }
     Frame {
         msec: 336
-        hash: "f3509a8a9fe255e30e1b23ca36803169"
+        hash: "9676fdc060e5784e96534a962992c024"
     }
     Frame {
         msec: 352
-        hash: "644629a42f8a2c8dc1f84e274e25df52"
+        hash: "c46634183e4bde82419bf757bd674a72"
     }
     Frame {
         msec: 368
-        hash: "e169e2e67b0ebffc2181463a1e155e5c"
+        hash: "d04d082f4a1602a308da7f373cbb4094"
     }
     Frame {
         msec: 384
-        hash: "74ccb97fe629c48211543e885930f18e"
+        hash: "a4178c9ffbb74f3f221fc63bee26ca35"
     }
     Frame {
         msec: 400
-        hash: "14d97918485475971a832002a333722d"
+        hash: "0667b13789a501995b2846f7d93fb973"
     }
     Frame {
         msec: 416
-        hash: "4e768d02555701df2109d07259228b05"
+        hash: "fda46bf0beecbb4326b2fc6f6926f0a7"
     }
     Frame {
         msec: 432
-        hash: "ceeeeffb00e1f74ace1a11832d183c81"
+        hash: "85cbdea027d76dee1dad376679a40a22"
     }
     Frame {
         msec: 448
-        hash: "3e6660aff9dfd72e5bd7e67d547af8b5"
+        hash: "0fd56200749ea5882e1bd714e9803d44"
     }
     Frame {
         msec: 464
-        hash: "991a782f939dbfe96b316254177f34ad"
+        hash: "10bf5c477f64f442990716b7eec8fd70"
     }
     Frame {
         msec: 480
-        hash: "ce4adfec222428d3fd7dd6069c69674c"
+        hash: "7cbd8ba3f09c3d00051cd33006381afb"
     }
     Frame {
         msec: 496
-        hash: "27d658710bdeb0395052291bb736fdac"
+        hash: "dca10161836025808cddce9fd93f2412"
     }
     Frame {
         msec: 512
-        hash: "a448c7c9fc2b4cf62f57ced461e39a05"
+        hash: "b949ec6303ccaafc203066c7f9b33ef2"
     }
     Frame {
         msec: 528
-        hash: "0e1fd2a517db3a3fafb2840bbe550592"
+        hash: "853c521bad75c08c0dfe3a00bed01136"
     }
     Frame {
         msec: 544
-        hash: "2ff7fe0c183fddc88d0daaabb866d78b"
+        hash: "dd76c440dc8cfcb7305409483d21d65d"
     }
     Frame {
         msec: 560
-        hash: "73c952ed17daaf19755728185d999f96"
+        hash: "c9b70db4b94e4b0cc855102f43b8e731"
     }
     Frame {
         msec: 576
-        hash: "85e9928b19d66b8ab1ee6b10d8b2b401"
+        hash: "d196057b8aa1e11ec9cf11032b57ca03"
     }
     Frame {
         msec: 592
-        hash: "0c6fa7c70f98d53f2f0425e79083dc2c"
+        hash: "0fae715746a8a340a8f3c4428cf96783"
     }
     Frame {
         msec: 608
-        hash: "589813b70ea86dd5ebe47ccf2121b5a8"
+        hash: "dd2e89d00ce85b167fbc822fedbfb449"
     }
     Frame {
         msec: 624
-        hash: "7b94db2fd4f35fda4183a4351581a931"
+        hash: "a5228adf745f580364eafcbbdd994178"
     }
     Frame {
         msec: 640
-        hash: "5769822d37ed1e88aacbbaaddbd7520a"
+        hash: "f750f588ee00805bc3757940f95de9ae"
     }
     Frame {
         msec: 656
-        hash: "36ab6549d745c1d0e7a7b47b9d1f6887"
+        hash: "55a79fefc2bf6d42b442e68150e3a9bc"
     }
     Frame {
         msec: 672
-        hash: "d130cecb02cdacc0cdbcce80e492d21b"
+        hash: "7b932e7585e66cc7cd31f858ce78a6e1"
     }
     Frame {
         msec: 688
-        hash: "d1395dbf450e90c4f18c872cd50fca8f"
+        hash: "10f204c59a5bff0c49dfc7691c35cef8"
     }
     Frame {
         msec: 704
-        hash: "7415bda155a9287ba22eac9c0548f10e"
+        hash: "cf901c80729eb0b83b46777e727d43e2"
     }
     Frame {
         msec: 720
-        hash: "b65b886a632b042c00317a4013071f6c"
+        hash: "f6bf6e11ef6a71d7e746fae1d0a44531"
     }
     Frame {
         msec: 736
-        hash: "cf4289cd85cb18bbf1a677008d8f1f0a"
+        hash: "4a8795196ece8c0ef18319008dbc0f2f"
     }
     Frame {
         msec: 752
-        hash: "97a6e76519c522854ec88cc9e40165da"
+        hash: "44d32f0b5377ad3b08928413f20e95e1"
     }
     Frame {
         msec: 768
-        hash: "bb80a571507cdc994f79ef05b0ad3b68"
+        hash: "9e0dd160a465573cbac831a14e36ba6d"
     }
     Frame {
         msec: 784
-        hash: "823d647182b73e0f57ff7aca373160f1"
+        hash: "fb2e2522cee569632d9682aa04e7ca08"
     }
     Frame {
         msec: 800
-        hash: "29b649d6cc3510a904561050bea9aa5b"
+        hash: "71b0e8d7671cee10f4f71a80abcde7ec"
     }
     Frame {
         msec: 816
-        hash: "195089eb803c1eef039bac097e446ae6"
+        hash: "4affee92d320d6eca9995ddd8989627f"
     }
     Frame {
         msec: 832
-        hash: "eb5d4b8a47cec6940c5c5019e1ca2fae"
+        hash: "b3e5e26a34cd491d3cd23f4e611266e2"
     }
     Frame {
         msec: 848
-        hash: "e8aebb115dba21f631ad6bce87615fd3"
+        hash: "aa185efe8d0c4c61d4df55266830cfd8"
     }
     Frame {
         msec: 864
-        hash: "15c9982c4c71542788e563db6e069fd1"
+        hash: "19c01ead1135f84b4b3a32583815fd10"
     }
     Frame {
         msec: 880
-        hash: "8124924f33282195f0a04cb178a332b1"
+        hash: "a231a722225c26ff764f16570d1e6beb"
     }
     Frame {
         msec: 896
-        hash: "0134d4df0b3b524107baa4068c64af7f"
+        hash: "466fce12d10bd4b714d4ead14d1c5839"
     }
     Frame {
         msec: 912
-        hash: "bd3015b94540bafebfc9a7190b0e3d6c"
+        hash: "158650554c8467ed7d93c3c11177e041"
     }
     Frame {
         msec: 928
-        hash: "3edcdf689225edcba379775c86390609"
+        hash: "ac16910bc816ca6c76a78160dda8380d"
     }
     Frame {
         msec: 944
-        hash: "407d4d439efec4cb07c80a5bc6638b51"
+        hash: "23ac6eeb0c9bd48dbc844b1263a18cbb"
     }
     Frame {
         msec: 960
@@ -246,58 +246,58 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "7b58d2d0726bb994d9e651411d76cbe4"
+        hash: "3da0b9d963113cfb58152bac1c757065"
     }
     Frame {
         msec: 992
-        hash: "15801c5e1e470c8c45c24debfb9b478b"
+        hash: "e1a33345ee1372069d9282406f1e5605"
     }
     Frame {
         msec: 1008
-        hash: "e257158a1da8908df7522bede4e9c4d9"
+        hash: "da872c570bccf17e88ac7db1d6d076ae"
     }
     Frame {
         msec: 1024
-        hash: "3cb21bef1761c2f70b880b54ca9234fc"
+        hash: "6feea54c6a7f9895001efeff177f9be9"
     }
     Frame {
         msec: 1040
-        hash: "b5effa369f0ab095f4345e2b9f6caa5f"
+        hash: "09049b33ca46a2fc2d06855e29ae66bf"
     }
     Frame {
         msec: 1056
-        hash: "aaafb43e6290a9e7b351dd7c13b8aaaf"
+        hash: "cd96d789f57ac1d425942416337174f1"
     }
     Frame {
         msec: 1072
-        hash: "8a4b622539868188f40f8c7fe75c6ddf"
+        hash: "0a763dd626e27ad14963aecfb8d7673c"
     }
     Frame {
         msec: 1088
-        hash: "365c2f7c0d1c718cf326864c3ba75d2e"
+        hash: "3d81f68bb7aac95b66b0cd0defbb3657"
     }
     Frame {
         msec: 1104
-        hash: "bac17384d4f375652bbc574459554835"
+        hash: "469b862006f99dfefcca803bc49287e3"
     }
     Frame {
         msec: 1120
-        hash: "6bf6917ee323a05824bd6d071459d0b2"
+        hash: "c3f698102bd46231430ab9e8029b8192"
     }
     Frame {
         msec: 1136
-        hash: "7aee8af3ef6b6592011b29281fb0e545"
+        hash: "421a9b4848a59281aea73c08a7219a33"
     }
     Frame {
         msec: 1152
-        hash: "5351b508cbd2e0352f230d211b864c4f"
+        hash: "0066eaa302678a4be35dca0c3ed33b1c"
     }
     Frame {
         msec: 1168
-        hash: "5a051f26ba6287707dbff8422d1eb9f3"
+        hash: "4cceb05bfeb231189b66f1fbdfaeccd3"
     }
     Frame {
         msec: 1184
-        hash: "67611596f75fe97b13a9cf0dc0313727"
+        hash: "ccf229cdd6fde7ef663791d27a008bee"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.0.png
index 22863cf..cd436b5 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.0.png
new file mode 100644
index 0000000..e47b479
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.qml
index 1a8af0e..f6cddc4 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.qml
@@ -6,126 +6,6 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 32
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 48
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 64
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 80
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 96
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 112
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 128
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 144
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 160
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 176
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 192
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 208
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 224
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 240
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 256
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 272
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 288
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 304
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 320
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 336
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 352
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 368
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 384
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 400
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 416
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 432
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 448
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
-    }
-    Frame {
-        msec: 464
-        hash: "c68e50ef84647962481121e2eb1ba4d4"
+        image: "plaintext2.0.png"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.0.png
index aac7c8d..ba833a2 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.0.png