From 9d74b306d099685ecdde906d8336ab915f948c4f Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Wed, 27 Jan 2010 14:28:21 +1000
Subject: Replace FreeMono by OCRA font

---
 .../declarative/qmlfontloader/data/FreeMono.ttf    | Bin 267400 -> 0 bytes
 .../qmlfontloader/data/tarzeau_ocr_a.ttf           | Bin 0 -> 24544 bytes
 .../qmlfontloader/tst_qmlfontloader.cpp            |   4 +-
 .../visual/webview/settings/FreeMono.ttf           | Bin 267400 -> 0 bytes
 .../webview/settings/data/setFontFamily.0.png      | Bin 9380 -> 12132 bytes
 .../visual/webview/settings/data/setFontFamily.qml | 170 ++++++++++-----------
 .../visual/webview/settings/setFontFamily.qml      |   6 +-
 .../visual/webview/settings/tarzeau_ocr_a.ttf      | Bin 0 -> 24544 bytes
 8 files changed, 90 insertions(+), 90 deletions(-)
 delete mode 100644 tests/auto/declarative/qmlfontloader/data/FreeMono.ttf
 create mode 100644 tests/auto/declarative/qmlfontloader/data/tarzeau_ocr_a.ttf
 delete mode 100644 tests/auto/declarative/visual/webview/settings/FreeMono.ttf
 create mode 100644 tests/auto/declarative/visual/webview/settings/tarzeau_ocr_a.ttf

diff --git a/tests/auto/declarative/qmlfontloader/data/FreeMono.ttf b/tests/auto/declarative/qmlfontloader/data/FreeMono.ttf
deleted file mode 100644
index d7ce52d..0000000
Binary files a/tests/auto/declarative/qmlfontloader/data/FreeMono.ttf and /dev/null differ
diff --git a/tests/auto/declarative/qmlfontloader/data/tarzeau_ocr_a.ttf b/tests/auto/declarative/qmlfontloader/data/tarzeau_ocr_a.ttf
new file mode 100644
index 0000000..cf93f96
Binary files /dev/null and b/tests/auto/declarative/qmlfontloader/data/tarzeau_ocr_a.ttf differ
diff --git a/tests/auto/declarative/qmlfontloader/tst_qmlfontloader.cpp b/tests/auto/declarative/qmlfontloader/tst_qmlfontloader.cpp
index 27664fb..25bb935 100644
--- a/tests/auto/declarative/qmlfontloader/tst_qmlfontloader.cpp
+++ b/tests/auto/declarative/qmlfontloader/tst_qmlfontloader.cpp
@@ -99,14 +99,14 @@ void tst_qmlfontloader::namedFont()
 
 void tst_qmlfontloader::localFont()
 {
-    QString componentStr = "import Qt 4.6\nFontLoader { source: \"" SRCDIR  "/data/FreeMono.ttf\" }";
+    QString componentStr = "import Qt 4.6\nFontLoader { source: \"" SRCDIR  "/data/tarzeau_ocr_a.ttf\" }";
     QmlComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl("file://"));
     QmlFontLoader *fontObject = qobject_cast<QmlFontLoader*>(component.create());
 
     QVERIFY(fontObject != 0);
     QVERIFY(fontObject->source() != QUrl(""));
-    QTRY_COMPARE(fontObject->name(), QString("FreeMono"));
+    QTRY_COMPARE(fontObject->name(), QString("OCRA"));
     QTRY_VERIFY(fontObject->status() == QmlFontLoader::Ready);
 }
 
diff --git a/tests/auto/declarative/visual/webview/settings/FreeMono.ttf b/tests/auto/declarative/visual/webview/settings/FreeMono.ttf
deleted file mode 100644
index d7ce52d..0000000
Binary files a/tests/auto/declarative/visual/webview/settings/FreeMono.ttf and /dev/null differ
diff --git a/tests/auto/declarative/visual/webview/settings/data/setFontFamily.0.png b/tests/auto/declarative/visual/webview/settings/data/setFontFamily.0.png
index 1a0448a..f3c621a 100644
Binary files a/tests/auto/declarative/visual/webview/settings/data/setFontFamily.0.png and b/tests/auto/declarative/visual/webview/settings/data/setFontFamily.0.png differ
diff --git a/tests/auto/declarative/visual/webview/settings/data/setFontFamily.qml b/tests/auto/declarative/visual/webview/settings/data/setFontFamily.qml
index da71ef1..cf74d42 100644
--- a/tests/auto/declarative/visual/webview/settings/data/setFontFamily.qml
+++ b/tests/auto/declarative/visual/webview/settings/data/setFontFamily.qml
@@ -6,239 +6,239 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 32
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 48
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 64
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 80
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 96
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 112
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 128
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 144
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 160
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 176
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 192
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 208
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 224
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 240
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 256
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 272
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 288
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 304
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 320
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 336
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 352
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 368
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 384
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 400
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 416
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 432
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 448
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 464
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 480
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 496
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 512
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 528
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 544
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 560
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 576
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 592
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 608
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 624
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 640
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 656
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 672
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 688
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 704
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 720
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 736
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 752
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 768
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 784
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 800
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 816
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 832
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 848
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 864
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 880
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 896
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 912
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 928
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 944
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 960
@@ -246,106 +246,106 @@ VisualTest {
     }
     Frame {
         msec: 976
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 992
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 1008
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 1024
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 1040
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 1056
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 1072
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 1088
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 1104
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 1120
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 1136
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 1152
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 1168
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 1184
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 1200
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 1216
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 1232
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 1248
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 1264
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 1280
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 1296
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 1312
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 1328
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 1344
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 1360
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
     Frame {
         msec: 1376
-        hash: "52d74d4a6716ed4d4e202de6480b13b2"
+        hash: "7ef8bb83c146898bd75de8951a932b58"
     }
 }
diff --git a/tests/auto/declarative/visual/webview/settings/setFontFamily.qml b/tests/auto/declarative/visual/webview/settings/setFontFamily.qml
index 99d5f2a..26deed8 100644
--- a/tests/auto/declarative/visual/webview/settings/setFontFamily.qml
+++ b/tests/auto/declarative/visual/webview/settings/setFontFamily.qml
@@ -2,9 +2,9 @@ import Qt 4.6
 
 WebView {
     url: "test.html"
-    width: 200
-    height: 200
+    width: 300
+    height: 300
     settings.standardFontFamily: font.name
     // WebKit doesn't seem to honour any other FontFamily settings
-    FontLoader { id: font; source: "FreeMono.ttf" }
+    FontLoader { id: font; source: "tarzeau_ocr_a.ttf" }
 }
diff --git a/tests/auto/declarative/visual/webview/settings/tarzeau_ocr_a.ttf b/tests/auto/declarative/visual/webview/settings/tarzeau_ocr_a.ttf
new file mode 100644
index 0000000..cf93f96
Binary files /dev/null and b/tests/auto/declarative/visual/webview/settings/tarzeau_ocr_a.ttf differ
-- 
cgit v0.12