diff options
author | Liang Qi <liang.qi@qt.io> | 2016-10-27 12:27:54 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-10-27 12:27:54 +0200 |
commit | 9d085bf0024c442b14b7d22bc629574058176deb (patch) | |
tree | 98dc9c7703454906e66f022688bbc9a01f10ea5f /tests/manual/scenegraph_lancelot/data/text/text_bitmapfont.qml | |
parent | 621c5b2b260d63fef7190c133f7384b8ccb93307 (diff) | |
parent | 6b58ce5251045fb751eb511b2cb3571bcd113f28 (diff) |
Merge remote-tracking branch 'origin/5.7' into 5.8v5.8.0-beta1
Conflicts:
tests/auto/quick/qquicktextedit/BLACKLIST
Change-Id: I0b9e5bea5da5d2666887c202e62d889b4aa56900
Diffstat (limited to 'tests/manual/scenegraph_lancelot/data/text/text_bitmapfont.qml')
-rw-r--r-- | tests/manual/scenegraph_lancelot/data/text/text_bitmapfont.qml | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/tests/manual/scenegraph_lancelot/data/text/text_bitmapfont.qml b/tests/manual/scenegraph_lancelot/data/text/text_bitmapfont.qml new file mode 100644 index 0000000000..d1a289e24f --- /dev/null +++ b/tests/manual/scenegraph_lancelot/data/text/text_bitmapfont.qml @@ -0,0 +1,18 @@ +// test use of Fixedsys font on Windows + +import QtQuick 2.0 + +Item { + width: 320 + height: 480 + + Text { + anchors.fill: parent + wrapMode: Text.Wrap + font.family: "Fixedsys" + font.pixelSize: 20 + text: "Foobar" + } +} + + |