diff options
author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-11-19 10:33:07 (GMT) |
---|---|---|
committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-11-19 10:33:07 (GMT) |
commit | 527f67325c200940e403f32b0db8f8c2677a1159 (patch) | |
tree | c12a152f12c3abcf9f46e4f0dc1784dee127340e /tests/auto/declarative/qmlvisual/shared/TestTextInput.qml | |
parent | a26d41fc2732e225dc9a1b5eb5224cc499ae87b4 (diff) | |
parent | 72378ce571bcb88d0519a1b02d0e543b5237d613 (diff) | |
download | Qt-527f67325c200940e403f32b0db8f8c2677a1159.zip Qt-527f67325c200940e403f32b0db8f8c2677a1159.tar.gz Qt-527f67325c200940e403f32b0db8f8c2677a1159.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into QTBUG-15333
Diffstat (limited to 'tests/auto/declarative/qmlvisual/shared/TestTextInput.qml')
-rw-r--r-- | tests/auto/declarative/qmlvisual/shared/TestTextInput.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qmlvisual/shared/TestTextInput.qml b/tests/auto/declarative/qmlvisual/shared/TestTextInput.qml index e01c2c2..64938e0 100644 --- a/tests/auto/declarative/qmlvisual/shared/TestTextInput.qml +++ b/tests/auto/declarative/qmlvisual/shared/TestTextInput.qml @@ -3,7 +3,7 @@ import "../shared" 1.0 TextInput { id: inp - FontLoader { id: fixedFont; source: "Vera.ttf" } + FontLoader { id: fixedFont; source: "DejaVuSansMono.ttf" } font.family: fixedFont.name font.pixelSize: 12 cursorDelegate: Rectangle { |