diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2017-09-08 11:04:30 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-09-08 11:04:30 +0200 |
commit | bde8c3cd9583ed9f3bdfc36a8699f56db20a6928 (patch) | |
tree | 33246b027739aafd72f9f289876f69627537f2b3 /tests/manual/scenegraph_lancelot/data/text/text_advance_latin.qml | |
parent | b63bc868875d7571bc332804f984824cff7c5b78 (diff) | |
parent | 685ad676a84bf48602a5da8f7171792686b94a73 (diff) |
Merge remote-tracking branch 'origin/dev' into wip/new-backend
Conflicts:
src/qml/compiler/qv4isel_moth.cpp
src/qml/compiler/qv4jsir.cpp
src/qml/jsruntime/qv4mathobject.cpp
Change-Id: I426f1f4f0a5302b5bcff021de11766a03fec7637
Diffstat (limited to 'tests/manual/scenegraph_lancelot/data/text/text_advance_latin.qml')
-rw-r--r-- | tests/manual/scenegraph_lancelot/data/text/text_advance_latin.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/manual/scenegraph_lancelot/data/text/text_advance_latin.qml b/tests/manual/scenegraph_lancelot/data/text/text_advance_latin.qml index ccab5d8c64..f5fc501bb8 100644 --- a/tests/manual/scenegraph_lancelot/data/text/text_advance_latin.qml +++ b/tests/manual/scenegraph_lancelot/data/text/text_advance_latin.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.10 Item { width: 320 |