update tests and visuals for qmlgraphicstext

20 files changed, 714 insertions, 714 deletions

diff --git a/tests/auto/declarative/visual/qfxtext/font/data-MAC/plaintext.qml b/tests/auto/declarative/visual/qfxtext/font/data-MAC/plaintext.qml
deleted file mode 100644
index 266c9a3..0000000
--- a/tests/auto/declarative/visual/qfxtext/font/data-MAC/plaintext.qml
+++ /dev/null
@@ -1,351 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 32
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 48
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 64
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 80
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 96
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 112
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 128
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 144
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 160
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 176
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 192
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 208
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 224
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 240
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 256
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 272
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 288
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 304
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 320
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 336
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 352
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 368
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 384
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 400
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 416
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 432
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 448
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 464
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 480
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 496
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 512
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 528
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 544
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 560
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 576
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 592
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 608
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 624
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 640
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 656
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 672
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 688
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 704
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 720
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 736
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 752
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 768
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 784
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 800
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 816
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 832
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 848
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 864
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 880
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 896
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 912
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 928
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 944
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 960
-        image: "plaintext.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 992
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 1008
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 1024
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 1040
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 1056
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 1072
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 1088
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 1104
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 1120
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 1136
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 1152
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 1168
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 1184
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1200
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 1216
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 1232
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 1248
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 1264
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 1280
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 1296
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 1312
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 1328
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-    Frame {
-        msec: 1344
-        hash: "9f3d0a505dec1982d9b405be72c265f8"
-    }
-}
diff --git a/tests/auto/declarative/visual/qfxtext/font/data-MAC/richtext.qml b/tests/auto/declarative/visual/qfxtext/font/data-MAC/richtext.qml
deleted file mode 100644
index e971809..0000000
--- a/tests/auto/declarative/visual/qfxtext/font/data-MAC/richtext.qml
+++ /dev/null
@@ -1,359 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 32
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 48
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 64
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 80
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 96
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 112
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 128
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 144
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 160
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 176
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 192
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 208
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 224
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 240
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 256
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 272
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 288
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 304
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 320
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 336
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 352
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 368
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 384
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 400
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 416
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 432
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 448
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 464
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 480
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 496
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 512
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 528
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 544
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 560
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 576
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 592
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 608
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 624
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 640
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 656
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 672
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 688
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 704
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 720
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 736
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 752
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 768
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 784
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 800
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 816
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 832
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 848
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 864
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 880
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 896
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 912
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 928
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 944
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 960
-        image: "richtext.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 992
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 1008
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 1024
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 1040
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 1056
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 1072
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 1088
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 1104
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 1120
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 1136
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 1152
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1168
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 1184
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 1200
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 1216
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 1232
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 1248
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 1264
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 1280
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 1296
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 1312
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 1328
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 1344
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 1360
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-    Frame {
-        msec: 1376
-        hash: "259cc9829171ea866dac4ffe8ef6b489"
-    }
-}
diff --git a/tests/auto/declarative/visual/qfxtext/elide/data-X11/elide.0.png b/tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/elide.0.png
index 5631a46..5631a46 100644
--- a/tests/auto/declarative/visual/qfxtext/elide/data-X11/elide.0.png
+++ b/tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/elide.0.png
diff --git a/tests/auto/declarative/visual/qfxtext/elide/data-X11/elide.qml b/tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/elide.qml
index cfd832e..cfd832e 100644
--- a/tests/auto/declarative/visual/qfxtext/elide/data-X11/elide.qml
+++ b/tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/elide.qml
diff --git a/tests/auto/declarative/visual/qfxtext/elide/data-X11/multilength.0.png b/tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/multilength.0.png
index 6e2b625..6e2b625 100644
--- a/tests/auto/declarative/visual/qfxtext/elide/data-X11/multilength.0.png
+++ b/tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/multilength.0.png
diff --git a/tests/auto/declarative/visual/qfxtext/elide/data-X11/multilength.qml b/tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/multilength.qml
index 0c06196..0c06196 100644
--- a/tests/auto/declarative/visual/qfxtext/elide/data-X11/multilength.qml
+++ b/tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/multilength.qml
diff --git a/tests/auto/declarative/visual/qfxtext/elide/data/elide.0.png b/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide.0.png
index 1a8c89b..1a8c89b 100644
--- a/tests/auto/declarative/visual/qfxtext/elide/data/elide.0.png
+++ b/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide.0.png
diff --git a/tests/auto/declarative/visual/qfxtext/elide/data/elide.qml b/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide.qml
index 59f17f7..59f17f7 100644
--- a/tests/auto/declarative/visual/qfxtext/elide/data/elide.qml
+++ b/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide.qml
diff --git a/tests/auto/declarative/visual/qfxtext/elide/elide.qml b/tests/auto/declarative/visual/qmlgraphicstext/elide/elide.qml
index 3c9ea5b..3c9ea5b 100644
--- a/tests/auto/declarative/visual/qfxtext/elide/elide.qml
+++ b/tests/auto/declarative/visual/qmlgraphicstext/elide/elide.qml
diff --git a/tests/auto/declarative/visual/qfxtext/elide/multilength.qml b/tests/auto/declarative/visual/qmlgraphicstext/elide/multilength.qml
index fa74cc4..fa74cc4 100644
--- a/tests/auto/declarative/visual/qfxtext/elide/multilength.qml
+++ b/tests/auto/declarative/visual/qmlgraphicstext/elide/multilength.qml
diff --git a/tests/auto/declarative/visual/qfxtext/font/data-MAC/plaintext.0.png b/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/plaintext.0.png
index a54a327..05a6e51 100644
--- a/tests/auto/declarative/visual/qfxtext/font/data-MAC/plaintext.0.png
+++ b/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/plaintext.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/plaintext.qml b/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/plaintext.qml
new file mode 100644
index 0000000..7e591c8
--- /dev/null
+++ b/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/plaintext.qml
@@ -0,0 +1,351 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 32
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 48
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 64
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 80
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 96
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 112
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 128
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 144
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 160
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 176
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 192
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 208
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 224
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 240
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 256
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 272
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 288
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 304
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 320
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 336
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 352
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 368
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 384
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 400
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 416
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 432
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 448
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 464
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 480
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 496
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 512
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 528
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 544
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 560
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 576
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 592
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 608
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 624
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 640
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 656
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 672
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 688
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 704
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 720
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 736
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 752
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 768
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 784
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 800
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 816
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 832
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 848
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 864
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 880
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 896
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 912
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 928
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 944
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 960
+        image: "plaintext.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 992
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 1008
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 1024
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 1040
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 1056
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 1072
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 1088
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 1104
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 1120
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 1136
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 1152
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 1168
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 1184
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1200
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 1216
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 1232
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 1248
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 1264
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 1280
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 1296
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 1312
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 1328
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+    Frame {
+        msec: 1344
+        hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+    }
+}
diff --git a/tests/auto/declarative/visual/qfxtext/font/data-MAC/richtext.0.png b/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/richtext.0.png
index c2ddee1..6379942 100644
--- a/tests/auto/declarative/visual/qfxtext/font/data-MAC/richtext.0.png
+++ b/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/richtext.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/richtext.qml b/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/richtext.qml
new file mode 100644
index 0000000..4414c1c
--- /dev/null
+++ b/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/richtext.qml
@@ -0,0 +1,359 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 32
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 48
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 64
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 80
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 96
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 112
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 128
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 144
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 160
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 176
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 192
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 208
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 224
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 240
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 256
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 272
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 288
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 304
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 320
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 336
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 352
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 368
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 384
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 400
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 416
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 432
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 448
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 464
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 480
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 496
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 512
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 528
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 544
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 560
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 576
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 592
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 608
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 624
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 640
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 656
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 672
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 688
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 704
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 720
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 736
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 752
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 768
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 784
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 800
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 816
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 832
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 848
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 864
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 880
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 896
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 912
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 928
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 944
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 960
+        image: "richtext.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 992
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1008
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1024
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1040
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1056
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1072
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1088
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1104
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1120
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1136
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1152
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1168
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1184
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1200
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1216
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1232
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1248
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1264
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1280
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1296
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1312
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1328
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1344
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1360
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1376
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+}
diff --git a/tests/auto/declarative/visual/qfxtext/font/data/plaintext.0.png b/tests/auto/declarative/visual/qmlgraphicstext/font/data/plaintext.0.png
index 50d56dc..50d56dc 100644
--- a/tests/auto/declarative/visual/qfxtext/font/data/plaintext.0.png
+++ b/tests/auto/declarative/visual/qmlgraphicstext/font/data/plaintext.0.png
diff --git a/tests/auto/declarative/visual/qfxtext/font/data/plaintext.qml b/tests/auto/declarative/visual/qmlgraphicstext/font/data/plaintext.qml
index f4cbcbd..f4cbcbd 100644
--- a/tests/auto/declarative/visual/qfxtext/font/data/plaintext.qml
+++ b/tests/auto/declarative/visual/qmlgraphicstext/font/data/plaintext.qml
diff --git a/tests/auto/declarative/visual/qfxtext/font/data/richtext.0.png b/tests/auto/declarative/visual/qmlgraphicstext/font/data/richtext.0.png
index 2910670..2910670 100644
--- a/tests/auto/declarative/visual/qfxtext/font/data/richtext.0.png
+++ b/tests/auto/declarative/visual/qmlgraphicstext/font/data/richtext.0.png
diff --git a/tests/auto/declarative/visual/qfxtext/font/data/richtext.qml b/tests/auto/declarative/visual/qmlgraphicstext/font/data/richtext.qml
index 9f396c2..9f396c2 100644
--- a/tests/auto/declarative/visual/qfxtext/font/data/richtext.qml
+++ b/tests/auto/declarative/visual/qmlgraphicstext/font/data/richtext.qml
diff --git a/tests/auto/declarative/visual/qfxtext/font/plaintext.qml b/tests/auto/declarative/visual/qmlgraphicstext/font/plaintext.qml
index f219e09..a3aa929 100644
--- a/tests/auto/declarative/visual/qfxtext/font/plaintext.qml
+++ b/tests/auto/declarative/visual/qmlgraphicstext/font/plaintext.qml
@@ -55,10 +55,10 @@ Rectangle {
             text: s.text; horizontalAlignment: Text.AlignLeft; width: 800
         }
         Text {
-            text: s.text; horizontalAlignment: Text.AlignHCenter; width: 800
+            text: s.text; horizontalAlignment: Text.AlignHCenter; verticalAlignment: Text.AlignVCenter; width: 800; height: 20
         }
         Text {
-            text: s.text; horizontalAlignment: Text.AlignRight; width: 800
+            text: s.text; horizontalAlignment: Text.AlignRight; verticalAlignment: Text.AlignBottom; width: 800; height: 20
         }
         Text {
             text: s.text; font.pixelSize: 18; style: Text.Outline; styleColor: "white"; wrap: true; width: 200
diff --git a/tests/auto/declarative/visual/qfxtext/font/richtext.qml b/tests/auto/declarative/visual/qmlgraphicstext/font/richtext.qml
index 00a9749..35aa232 100644
--- a/tests/auto/declarative/visual/qfxtext/font/richtext.qml
+++ b/tests/auto/declarative/visual/qmlgraphicstext/font/richtext.qml
@@ -55,10 +55,10 @@ Rectangle {
             text: s.text; horizontalAlignment: Text.AlignLeft; width: 800
         }
         Text {
-            text: s.text; horizontalAlignment: Text.AlignHCenter; width: 800
+            text: s.text; horizontalAlignment: Text.AlignHCenter; verticalAlignment: Text.AlignVCenter; width: 800; height: 20
         }
         Text {
-            text: s.text; horizontalAlignment: Text.AlignRight; width: 800
+            text: s.text; horizontalAlignment: Text.AlignRight; verticalAlignment: Text.AlignBottom; width: 800; height: 20
         }
         Text {
             text: s.text; font.pixelSize: 18; style: Text.Outline; styleColor: "white"; wrap: true; width: 200