Merge remote-tracking branch 'origin/5.9' into 5.10

 Conflicts:
	.qmake.conf
	src/qml/compiler/qv4codegen.cpp
	src/qml/compiler/qv4compileddata_p.h
	src/qml/debugger/qqmlprofiler_p.h
	src/qml/jsruntime/qv4engine.cpp
	src/qml/memory/qv4mm.cpp
	src/qml/qml/qqmlcomponent.cpp
	src/qml/qml/qqmlobjectcreator.cpp
	src/qml/qml/qqmlobjectcreator_p.h
	src/qml/types/qqmldelegatemodel.cpp
	src/quick/items/qquickitem_p.h
	src/quick/items/qquickwindow.cpp
	tests/auto/quick/touchmouse/BLACKLIST
	tests/benchmarks/qml/holistic/tst_holistic.cpp

Change-Id: I520f349ab4b048dd337d9647113564fc257865c2

2 files changed, 90 insertions, 0 deletions

diff --git a/tests/manual/scenegraph_lancelot/data/text/text_emoji_hebrew.qml b/tests/manual/scenegraph_lancelot/data/text/text_emoji_hebrew.qml
new file mode 100644
index 0000000000..b67d584a12
--- /dev/null
+++ b/tests/manual/scenegraph_lancelot/data/text/text_emoji_hebrew.qml
@@ -0,0 +1,45 @@
+import QtQuick 2.0
+
+Item {
+    width: 320
+    height: 480
+
+    Component {
+        id: component
+        Column {
+            property variant listModel: model
+            Repeater {
+                model: [Text.NativeRendering, Text.QtRendering]
+                Rectangle {
+                    width: text.implicitWidth
+                    height: text.implicitHeight
+                    color: listModel.backGroundColor ? listModel.backGroundColor : "white"
+
+                    Text {
+                        id: text
+                        font.pixelSize: 32
+                        renderType: modelData
+                        text: "א😃א😇א😍א😜א😸!"
+
+                        color: listModel.color ? listModel.color : "black"
+                        opacity: listModel.opacity ? listModel.opacity : 1.0
+                    }
+                }
+            }
+        }
+    }
+
+    Column {
+        anchors.centerIn: parent
+        Repeater {
+            model: ListModel {
+                ListElement { color: "black" }
+                ListElement { color: "blue" }
+                ListElement { color: "#990000ff" }
+                ListElement { opacity: 0.5 }
+                ListElement { backGroundColor: "green" }
+            }
+            delegate: component
+        }
+    }
+}
diff --git a/tests/manual/scenegraph_lancelot/data/text/text_emoji_zwj.qml b/tests/manual/scenegraph_lancelot/data/text/text_emoji_zwj.qml
new file mode 100644
index 0000000000..4691ff7efd
--- /dev/null
+++ b/tests/manual/scenegraph_lancelot/data/text/text_emoji_zwj.qml
@@ -0,0 +1,45 @@
+import QtQuick 2.0
+
+Item {
+    width: 320
+    height: 480
+
+    Component {
+        id: component
+        Column {
+            property variant listModel: model
+            Repeater {
+                model: [Text.NativeRendering, Text.QtRendering]
+                Rectangle {
+                    width: text.implicitWidth
+                    height: text.implicitHeight
+                    color: listModel.backGroundColor ? listModel.backGroundColor : "white"
+
+                    Text {
+                        id: text
+                        font.pixelSize: 32
+                        renderType: modelData
+                        text: "👨‍👩‍👧‍👦"
+
+                        color: listModel.color ? listModel.color : "black"
+                        opacity: listModel.opacity ? listModel.opacity : 1.0
+                    }
+                }
+            }
+        }
+    }
+
+    Column {
+        anchors.centerIn: parent
+        Repeater {
+            model: ListModel {
+                ListElement { color: "black" }
+                ListElement { color: "blue" }
+                ListElement { color: "#990000ff" }
+                ListElement { opacity: 0.5 }
+                ListElement { backGroundColor: "green" }
+            }
+            delegate: component
+        }
+    }
+}