From b8e788865cae90122e51ad1a2649d0891370fb3d Mon Sep 17 00:00:00 2001 From: Yann Bodson Date: Thu, 5 Nov 2009 15:05:03 +1000 Subject: use FreeMono.ttf --- examples/declarative/fonts/fonts.qml | 3 +-- examples/declarative/fonts/fonts/Fontin-Bold.ttf | Bin 30916 -> 0 bytes examples/declarative/fonts/fonts/FreeMono.ttf | Bin 0 -> 267400 bytes .../declarative/qmlfontloader/data/Fontin-Bold.ttf | Bin 30916 -> 0 bytes tests/auto/declarative/qmlfontloader/data/FreeMono.ttf | Bin 0 -> 267400 bytes .../declarative/qmlfontloader/tst_qmlfontloader.cpp | 4 ++-- 6 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 examples/declarative/fonts/fonts/Fontin-Bold.ttf create mode 100644 examples/declarative/fonts/fonts/FreeMono.ttf delete mode 100644 tests/auto/declarative/qmlfontloader/data/Fontin-Bold.ttf create mode 100644 tests/auto/declarative/qmlfontloader/data/FreeMono.ttf 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 Binary files a/examples/declarative/fonts/fonts/Fontin-Bold.ttf and /dev/null differ diff --git a/examples/declarative/fonts/fonts/FreeMono.ttf b/examples/declarative/fonts/fonts/FreeMono.ttf new file mode 100644 index 0000000..d7ce52d Binary files /dev/null and b/examples/declarative/fonts/fonts/FreeMono.ttf differ 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 Binary files a/tests/auto/declarative/qmlfontloader/data/Fontin-Bold.ttf and /dev/null differ 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 Binary files /dev/null and b/tests/auto/declarative/qmlfontloader/data/FreeMono.ttf differ 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(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); } -- cgit v0.12