diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-10-28 05:45:05 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-10-28 05:45:05 (GMT) |
| commit | 44be8cc3bb1aebd47f75dcf9cae54884322e1955 (patch) | |
| tree | 548c76a8a6144955a1ba1ccc85e2c9f997fafa10 /examples/declarative/fonts | |
| parent | dbba440da0677b8174d087d498d3d0dbd465548a (diff) | |
| parent | e78a0d8f7449b81c971284310e6fb255d4a9d4eb (diff) | |
| download | Qt-44be8cc3bb1aebd47f75dcf9cae54884322e1955.zip Qt-44be8cc3bb1aebd47f75dcf9cae54884322e1955.tar.gz Qt-44be8cc3bb1aebd47f75dcf9cae54884322e1955.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'examples/declarative/fonts')
| -rw-r--r-- | examples/declarative/fonts/fonts.qml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/examples/declarative/fonts/fonts.qml b/examples/declarative/fonts/fonts.qml index 4029f8b..e68bdb6 100644 --- a/examples/declarative/fonts/fonts.qml +++ b/examples/declarative/fonts/fonts.qml @@ -22,21 +22,21 @@ Rectangle { Text { text: myText color: palette.windowText - width: parent.width; elide: "ElideRight" + width: parent.width; elide: Text.ElideRight font.family: "Times" font.pointSize: 32 } Text { text: myText color: palette.windowText - width: parent.width; elide: "ElideRight" + width: parent.width; elide: Text.ElideRight font.family: fixedFont.name font.pointSize: 32 } Text { text: myText color: palette.windowText - width: parent.width; elide: "ElideRight" + width: parent.width; elide: Text.ElideRight font.family: localFont.name font.pointSize: 32 } @@ -47,7 +47,7 @@ Rectangle { else if (webFont.status == 3) "Error loading font" } color: palette.windowText - width: parent.width; elide: "ElideRight" + width: parent.width; elide: Text.ElideRight font.family: webFont.name font.pointSize: 32 } @@ -58,7 +58,7 @@ Rectangle { else if (webFont2.status == 3) "Error loading font" } color: palette.windowText - width: parent.width; elide: "ElideRight" + width: parent.width; elide: Text.ElideRight font.family: webFont2.name font.pointSize: 32 } |