diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-04-15 02:02:49 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-04-15 02:02:49 (GMT) |
| commit | 2d9bc3296168de084fab45a4008edab8c290c3ff (patch) | |
| tree | 0d3cc168bc79e4d1728d2805f10869d5146015f7 | |
| parent | 0ddd9958b483e4dbbd5d4b69f3a8425855bdc53b (diff) | |
| parent | 9d9ac32f7be34c9ac30b23cf55b3f383d6c70568 (diff) | |
| download | Qt-2d9bc3296168de084fab45a4008edab8c290c3ff.zip Qt-2d9bc3296168de084fab45a4008edab8c290c3ff.tar.gz Qt-2d9bc3296168de084fab45a4008edab8c290c3ff.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
| -rw-r--r-- | examples/declarative/fonts/fonts.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/declarative/fonts/fonts.qml b/examples/declarative/fonts/fonts.qml index 97dd645..ae31b03 100644 --- a/examples/declarative/fonts/fonts.qml +++ b/examples/declarative/fonts/fonts.qml @@ -7,7 +7,7 @@ Rectangle { color: "steelblue" FontLoader { id: fixedFont; name: "Courier" } - FontLoader { id: localFont; source: "fonts/tarzenau-ocr-a.ttf" } + FontLoader { id: localFont; source: "fonts/tarzeau_ocr_a.ttf" } FontLoader { id: webFont; source: "http://www.princexml.com/fonts/steffmann/Starburst.ttf" } Column { @@ -19,7 +19,7 @@ Rectangle { color: "lightsteelblue" width: parent.width elide: Text.ElideRight - font.family: "Times"; font.pointSize: 42 + font.family: "Times"; font.pointSize: 42 } Text { text: myText |