diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2010-11-18 01:19:33 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-11-18 01:19:33 (GMT) |
| commit | 051793b7558ed16dfcb84f62ce3bd4a1545906a7 (patch) | |
| tree | 2496fdaec40857e9982c93d18107e09e233145d4 /tests/auto/declarative/qmlvisual/shared/TestTextInput.qml | |
| parent | 14ddf44ce2fdd7195741b9683226a3cd774e17e4 (diff) | |
| parent | cca7c5b40751e2192ba2c7c7422557eeb5672a17 (diff) | |
| download | Qt-051793b7558ed16dfcb84f62ce3bd4a1545906a7.zip Qt-051793b7558ed16dfcb84f62ce3bd4a1545906a7.tar.gz Qt-051793b7558ed16dfcb84f62ce3bd4a1545906a7.tar.bz2 | |
Merge remote branch 'qt/4.7' into 4.7
Conflicts:
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
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 { |