diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-27 09:54:43 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-27 09:56:20 +0200 |
| commit | 6b58ce5251045fb751eb511b2cb3571bcd113f28 (patch) | |
| tree | 7d3b63836c7ec0cce618ce4180c9f5ed63900a6a /tests/manual | |
| parent | 93d7c26653757755ae65f14d06d6df6f9ec2fc07 (diff) | |
| parent | c849f3a7eff55d60c4010831ec67336c5c0f2a27 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/quick/items/qquickwindow.cpp
tests/auto/quick/qquicktext/BLACKLIST
tests/auto/quick/qquicktextedit/BLACKLIST
Change-Id: I8bd68b0b5e853b7908791d2cbddd18dd527c76ae
Diffstat (limited to 'tests/manual')
| -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" + } +} + + |