Merge remote-tracking branch 'origin/5.7' into 5.8

Conflicts:
	src/qml/jsruntime/qv4string.cpp

The conflict resolution for qv4tsring.cpp is to essentially omit the
change of commit 64714ea431f2fd355ed27edc69dba4e992511e75 as the code in
5.8 already uses the add/mul_overflow functions.

This merge also reverts commit f4ac007f4a19bc095ff15d415a6629986de78e49
as we can deal with dead store elimination now.

Change-Id: Iee08c87cbe1a2ff23a73ce621d56262b4e007c56

1 files changed, 20 insertions, 0 deletions

diff --git a/tests/auto/quick/qquicktextedit/data/cursorHeight.qml b/tests/auto/quick/qquicktextedit/data/cursorHeight.qml
new file mode 100644
index 0000000000..b831a9eb6f
--- /dev/null
+++ b/tests/auto/quick/qquicktextedit/data/cursorHeight.qml
@@ -0,0 +1,20 @@
+import QtQuick 2.0
+
+Rectangle {
+    width: 300
+    height: 300
+    color: "white"
+
+    TextEdit {
+        objectName: "textEditObject"
+        width: 300
+        height: 300
+        text: "<span style=\"font-size:20pt;\">Blah</span><br>blah"
+        textFormat: TextEdit.RichText
+        cursorDelegate: Rectangle {
+            objectName: "cursorInstance"
+            color: "red"
+            width: 2
+        }
+    }
+}