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

9 files changed, 37 insertions, 6 deletions

diff --git a/tests/manual/pointer/main.cpp b/tests/manual/pointer/main.cpp
index 7935b4072c..5f6af79973 100644
--- a/tests/manual/pointer/main.cpp
+++ b/tests/manual/pointer/main.cpp
@@ -44,6 +44,7 @@
 
 int main(int argc, char *argv[])
 {
+    QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
     QGuiApplication app(argc, argv);
 
     QQmlApplicationEngine engine;
diff --git a/tests/manual/scenegraph_lancelot/data/text/text_advance_bidi_ltr.qml b/tests/manual/scenegraph_lancelot/data/text/text_advance_bidi_ltr.qml
index 2f40aece89..e5d230e309 100644
--- a/tests/manual/scenegraph_lancelot/data/text/text_advance_bidi_ltr.qml
+++ b/tests/manual/scenegraph_lancelot/data/text/text_advance_bidi_ltr.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.10
 
 Item {
     width: 320
diff --git a/tests/manual/scenegraph_lancelot/data/text/text_advance_hebrew.qml b/tests/manual/scenegraph_lancelot/data/text/text_advance_hebrew.qml
index 0a9dce4d82..000977f964 100644
--- a/tests/manual/scenegraph_lancelot/data/text/text_advance_hebrew.qml
+++ b/tests/manual/scenegraph_lancelot/data/text/text_advance_hebrew.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.10
 
 Item {
     width: 320
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
diff --git a/tests/manual/scenegraph_lancelot/data/text/text_advance_multiline.qml b/tests/manual/scenegraph_lancelot/data/text/text_advance_multiline.qml
index ae0f10718c..a58a7cb40c 100644
--- a/tests/manual/scenegraph_lancelot/data/text/text_advance_multiline.qml
+++ b/tests/manual/scenegraph_lancelot/data/text/text_advance_multiline.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.10
 
 Item {
     width: 320
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
diff --git a/tests/manual/scenegraph_lancelot/data/text/text_advance_multiparagraph_multifontsizes.qml b/tests/manual/scenegraph_lancelot/data/text/text_advance_multiparagraph_multifontsizes.qml
index de33d65cdc..fb1f252148 100644
--- a/tests/manual/scenegraph_lancelot/data/text/text_advance_multiparagraph_multifontsizes.qml
+++ b/tests/manual/scenegraph_lancelot/data/text/text_advance_multiparagraph_multifontsizes.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.10
 
 Item {
     width: 320
diff --git a/tests/manual/scenegraph_lancelot/data/text/text_bengali_noshaping.qml b/tests/manual/scenegraph_lancelot/data/text/text_bengali_noshaping.qml
new file mode 100644
index 0000000000..343d5768e4
--- /dev/null
+++ b/tests/manual/scenegraph_lancelot/data/text/text_bengali_noshaping.qml
@@ -0,0 +1,15 @@
+import QtQuick 2.0
+
+Item {
+    width: 320
+    height: 480
+
+    Text {
+        anchors.fill: parent
+        wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+        font.family: "Arial" // Should use Lohit Bengali
+        font.pixelSize: 20
+        font.preferShaping: false
+        text: "ধারা ১: সমস্ত মানুষ স্বাধীনভাবে সমান মর্যাদা এবং অধিকার নিয়ে জন্মগ্রহণ করে। তাঁদের বিবেক এবং বুদ্ধি আছে; সুতরাং সকলেরই একে অপরের প্রতি ভ্রাতৃত্বসুলভ মনোভাব নিয়ে আচরণ করা উচিৎ।"
+    }
+}
diff --git a/tests/manual/scenegraph_lancelot/data/text/text_latin_noshaping.qml b/tests/manual/scenegraph_lancelot/data/text/text_latin_noshaping.qml
new file mode 100644
index 0000000000..6dc6c2f3d6
--- /dev/null
+++ b/tests/manual/scenegraph_lancelot/data/text/text_latin_noshaping.qml
@@ -0,0 +1,15 @@
+import QtQuick 2.0
+
+Item {
+    width: 320
+    height: 480
+
+    Text {
+        anchors.fill: parent
+        wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+        font.family: "Arial"
+        font.pixelSize: 20
+        font.preferShaping: false
+        text: "Are griffins birds or mammals?"
+    }
+}