diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-03-21 20:42:38 +0100 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-03-21 20:42:47 +0100 |
commit | 6767114285db9d0e16dc278d08f231e8561546b4 (patch) | |
tree | 0945902a2242fd7ec0a1f7fd3e6acbb769e723bd /tests/manual/scenegraph_lancelot/data/text/text_advance_multiparagraph.qml | |
parent | ee076afedccbe1d37306a7972051f84eb036d655 (diff) | |
parent | c32b109e9dea44c6775c2dbf8f164870c1dc8971 (diff) |
Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Change-Id: Ib5662d80d5b2f58cf4634c54c054545ba9df807e
Diffstat (limited to 'tests/manual/scenegraph_lancelot/data/text/text_advance_multiparagraph.qml')
-rw-r--r-- | tests/manual/scenegraph_lancelot/data/text/text_advance_multiparagraph.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/manual/scenegraph_lancelot/data/text/text_advance_multiparagraph.qml b/tests/manual/scenegraph_lancelot/data/text/text_advance_multiparagraph.qml index 76f0910680..0627656ea6 100644 --- a/tests/manual/scenegraph_lancelot/data/text/text_advance_multiparagraph.qml +++ b/tests/manual/scenegraph_lancelot/data/text/text_advance_multiparagraph.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.10 Item { width: 320 |