12 files changed, 195 insertions, 178 deletions

diff --git a/examples/declarative/fonts/fonts.qml b/examples/declarative/fonts/fonts.qml
index 80d82ad..c7af666 100644
--- a/examples/declarative/fonts/fonts.qml
+++ b/examples/declarative/fonts/fonts.qml
@@ -8,8 +8,7 @@ Rectangle {
 
     FontLoader { id: fixedFont; name: "Courier" }
 
-    FontLoader { id: localFont; source: "fonts/Fontin-Bold.ttf" }
-    /* A font by Jos Buivenga (exljbris) -> www.exljbris.nl */
+    FontLoader { id: localFont; source: "fonts/FreeMono.ttf" }
 
     FontLoader { id: webFont; source: "http://www.princexml.com/fonts/steffmann/Starburst.ttf" }
     FontLoader { id: webFont2; source: "http://wrong.address.org" }
diff --git a/examples/declarative/fonts/fonts/Fontin-Bold.ttf b/examples/declarative/fonts/fonts/Fontin-Bold.ttf
deleted file mode 100644
index f6a33b0..0000000
--- a/examples/declarative/fonts/fonts/Fontin-Bold.ttf
+++ /dev/null
diff --git a/examples/declarative/fonts/fonts/FreeMono.ttf b/examples/declarative/fonts/fonts/FreeMono.ttf
new file mode 100644
index 0000000..d7ce52d
--- /dev/null
+++ b/examples/declarative/fonts/fonts/FreeMono.ttf
diff --git a/tests/auto/declarative/qmlfontloader/data/Fontin-Bold.ttf b/tests/auto/declarative/qmlfontloader/data/Fontin-Bold.ttf
deleted file mode 100644
index f6a33b0..0000000
--- a/tests/auto/declarative/qmlfontloader/data/Fontin-Bold.ttf
+++ /dev/null
diff --git a/tests/auto/declarative/qmlfontloader/data/FreeMono.ttf b/tests/auto/declarative/qmlfontloader/data/FreeMono.ttf
new file mode 100644
index 0000000..d7ce52d
--- /dev/null
+++ b/tests/auto/declarative/qmlfontloader/data/FreeMono.ttf
diff --git a/tests/auto/declarative/qmlfontloader/tst_qmlfontloader.cpp b/tests/auto/declarative/qmlfontloader/tst_qmlfontloader.cpp
index 23f7025..a5ab13d 100644
--- a/tests/auto/declarative/qmlfontloader/tst_qmlfontloader.cpp
+++ b/tests/auto/declarative/qmlfontloader/tst_qmlfontloader.cpp
@@ -97,13 +97,13 @@ void tst_qmlfontloader::namedFont()
 
 void tst_qmlfontloader::localFont()
 {
-    QString componentStr = "import Qt 4.6\nFontLoader { source: \"" SRCDIR  "/data/Fontin-Bold.ttf\" }";
+    QString componentStr = "import Qt 4.6\nFontLoader { source: \"" SRCDIR  "/data/FreeMono.ttf\" }";
     QmlComponent component(&engine, componentStr.toLatin1(), QUrl("file://"));
     QmlFontLoader *fontObject = qobject_cast<QmlFontLoader*>(component.create());
 
     QVERIFY(fontObject != 0);
     QVERIFY(fontObject->source() != QUrl(""));
-    QTRY_COMPARE(fontObject->name(), QString("Fontin"));
+    QTRY_COMPARE(fontObject->name(), QString("FreeMono"));
     QTRY_VERIFY(fontObject->status() == QmlFontLoader::Ready);
 }
 
diff --git a/tests/auto/declarative/visual/qfxtext/font/data-MAC/plaintext.0.png b/tests/auto/declarative/visual/qfxtext/font/data-MAC/plaintext.0.png
index 50d56dc..a54a327 100644
--- a/tests/auto/declarative/visual/qfxtext/font/data-MAC/plaintext.0.png
+++ b/tests/auto/declarative/visual/qfxtext/font/data-MAC/plaintext.0.png
diff --git a/tests/auto/declarative/visual/qfxtext/font/data-MAC/plaintext.qml b/tests/auto/declarative/visual/qfxtext/font/data-MAC/plaintext.qml
index 63e20d4..266c9a3 100644
--- a/tests/auto/declarative/visual/qfxtext/font/data-MAC/plaintext.qml
+++ b/tests/auto/declarative/visual/qfxtext/font/data-MAC/plaintext.qml
@@ -6,239 +6,239 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 32
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 48
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 64
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 80
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 96
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 112
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 128
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 144
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 160
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 176
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 192
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 208
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 224
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 240
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 256
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 272
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 288
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 304
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 320
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 336
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 352
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 368
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 384
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 400
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 416
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 432
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 448
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 464
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 480
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 496
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 512
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 528
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 544
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 560
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 576
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 592
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 608
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 624
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 640
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 656
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 672
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 688
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 704
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 720
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 736
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 752
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 768
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 784
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 800
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 816
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 832
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 848
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 864
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 880
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 896
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 912
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 928
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 944
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 960
@@ -246,59 +246,59 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 992
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 1008
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 1024
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 1040
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 1056
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 1072
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 1088
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 1104
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 1120
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 1136
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 1152
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 1168
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 1184
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Key {
         type: 6
@@ -310,42 +310,42 @@ VisualTest {
     }
     Frame {
         msec: 1200
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 1216
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 1232
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 1248
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 1264
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 1280
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 1296
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 1312
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 1328
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
     Frame {
         msec: 1344
-        hash: "d553014bc56a46787e30459b0f44f57a"
+        hash: "9f3d0a505dec1982d9b405be72c265f8"
     }
 }
diff --git a/tests/auto/declarative/visual/qfxtext/font/data-MAC/richtext.0.png b/tests/auto/declarative/visual/qfxtext/font/data-MAC/richtext.0.png
index 2910670..c2ddee1 100644
--- a/tests/auto/declarative/visual/qfxtext/font/data-MAC/richtext.0.png
+++ b/tests/auto/declarative/visual/qfxtext/font/data-MAC/richtext.0.png
diff --git a/tests/auto/declarative/visual/qfxtext/font/data-MAC/richtext.qml b/tests/auto/declarative/visual/qfxtext/font/data-MAC/richtext.qml
index d55ad90..e971809 100644
--- a/tests/auto/declarative/visual/qfxtext/font/data-MAC/richtext.qml
+++ b/tests/auto/declarative/visual/qfxtext/font/data-MAC/richtext.qml
@@ -6,239 +6,239 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 32
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 48
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 64
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 80
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 96
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 112
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 128
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 144
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 160
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 176
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 192
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 208
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 224
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 240
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 256
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 272
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 288
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 304
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 320
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 336
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 352
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 368
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 384
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 400
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 416
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 432
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 448
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 464
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 480
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 496
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 512
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 528
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 544
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 560
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 576
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 592
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 608
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 624
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 640
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 656
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 672
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 688
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 704
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 720
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 736
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 752
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 768
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 784
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 800
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 816
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 832
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 848
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 864
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 880
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 896
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 912
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 928
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 944
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 960
@@ -246,51 +246,51 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 992
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 1008
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 1024
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 1040
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 1056
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 1072
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 1088
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 1104
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 1120
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 1136
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 1152
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Key {
         type: 6
@@ -302,58 +302,58 @@ VisualTest {
     }
     Frame {
         msec: 1168
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 1184
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 1200
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 1216
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 1232
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 1248
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 1264
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 1280
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 1296
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 1312
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 1328
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 1344
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 1360
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
     Frame {
         msec: 1376
-        hash: "dfea78484b840b8cab690e277b960723"
+        hash: "259cc9829171ea866dac4ffe8ef6b489"
     }
 }
diff --git a/tests/auto/declarative/visual/qfxtext/font/plaintext.qml b/tests/auto/declarative/visual/qfxtext/font/plaintext.qml
index c58b95c..f219e09 100644
--- a/tests/auto/declarative/visual/qfxtext/font/plaintext.qml
+++ b/tests/auto/declarative/visual/qfxtext/font/plaintext.qml
@@ -1,7 +1,7 @@
 import Qt 4.6
 
 Rectangle {
-    id: s; width: 800; height: 800; color: "lightsteelblue"
+    id: s; width: 800; height: 1000; color: "lightsteelblue"
     property string text: "The quick brown fox jumps over the lazy dog."
 
     Column {
@@ -16,7 +16,7 @@ Rectangle {
             text: s.text; font.pointSize: 25
         }
         Text {
-            text: s.text; color: "red"
+            text: s.text; color: "red"; smooth: true
         }
         Text {
             text: s.text; font.capitalization: "AllUppercase"
@@ -25,7 +25,7 @@ Rectangle {
             text: s.text; font.underline: true
         }
         Text {
-            text: s.text; font.overline: true
+            text: s.text; font.overline: true; smooth: true
         }
         Text {
             text: s.text; font.strikeout: true
@@ -72,5 +72,14 @@ Rectangle {
         Text {
             text: s.text; elide: Text.ElideRight; width: 200
         }
+        Text {
+            text: s.text; elide: Text.ElideLeft; width: 200; wrap: true
+        }
+        Text {
+            text: s.text; elide: Text.ElideMiddle; width: 200; wrap: true
+        }
+        Text {
+            text: s.text; elide: Text.ElideRight; width: 200; wrap: true
+        }
     }
 }
diff --git a/tests/auto/declarative/visual/qfxtext/font/richtext.qml b/tests/auto/declarative/visual/qfxtext/font/richtext.qml
index 390527a..00a9749 100644
--- a/tests/auto/declarative/visual/qfxtext/font/richtext.qml
+++ b/tests/auto/declarative/visual/qfxtext/font/richtext.qml
@@ -1,7 +1,7 @@
 import Qt 4.6
 
 Rectangle {
-    id: s; width: 800; height: 800; color: "lightsteelblue"
+    id: s; width: 800; height: 1000; color: "lightsteelblue"
     property string text: "<b>The</b> <i>quick</i> <u>brown</u> <o>fox</o> <big>jumps</big> <small>over</small> <tt>the</tt> <s>lazy</s> <em>dog</em>."
 
     Column {
@@ -16,7 +16,7 @@ Rectangle {
             text: s.text; font.pointSize: 25
         }
         Text {
-            text: s.text; color: "red"
+            text: s.text; color: "red"; smooth: true
         }
         Text {
             text: s.text; font.capitalization: "AllUppercase"
@@ -25,7 +25,7 @@ Rectangle {
             text: s.text; font.underline: true
         }
         Text {
-            text: s.text; font.overline: true
+            text: s.text; font.overline: true; smooth: true
         }
         Text {
             text: s.text; font.strikeout: true
@@ -72,5 +72,14 @@ Rectangle {
         Text {
             text: s.text; elide: Text.ElideRight; width: 200
         }
+        Text {
+            text: s.text; elide: Text.ElideLeft; width: 200; wrap: true
+        }
+        Text {
+            text: s.text; elide: Text.ElideMiddle; width: 200; wrap: true
+        }
+        Text {
+            text: s.text; elide: Text.ElideRight; width: 200; wrap: true
+        }
     }
 }