diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2009-11-05 05:05:03 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2009-11-05 05:05:03 (GMT) |
| commit | b8e788865cae90122e51ad1a2649d0891370fb3d (patch) | |
| tree | a07eb2f0538a5263cce62231d585a6f80af2e887 | |
| parent | b8ff76b37ee51585293dedb998b8f0b3c8b00e2f (diff) | |
| download | Qt-b8e788865cae90122e51ad1a2649d0891370fb3d.zip Qt-b8e788865cae90122e51ad1a2649d0891370fb3d.tar.gz Qt-b8e788865cae90122e51ad1a2649d0891370fb3d.tar.bz2 | |
use FreeMono.ttf
| -rw-r--r-- | examples/declarative/fonts/fonts.qml | 3 | ||||
| -rw-r--r-- | examples/declarative/fonts/fonts/Fontin-Bold.ttf | bin | 30916 -> 0 bytes | |||
| -rw-r--r-- | examples/declarative/fonts/fonts/FreeMono.ttf | bin | 0 -> 267400 bytes | |||
| -rw-r--r-- | tests/auto/declarative/qmlfontloader/data/Fontin-Bold.ttf | bin | 30916 -> 0 bytes | |||
| -rw-r--r-- | tests/auto/declarative/qmlfontloader/data/FreeMono.ttf | bin | 0 -> 267400 bytes | |||
| -rw-r--r-- | tests/auto/declarative/qmlfontloader/tst_qmlfontloader.cpp | 4 |
6 files changed, 3 insertions, 4 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 Binary files differdeleted 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 Binary files differnew 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 Binary files differdeleted 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 Binary files differnew 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); } |