Merge remote-tracking branch 'origin/dev' into wip/pointerhandler

Conflicts:
      examples/quick/shared/LauncherList.qml
      src/quick/items/qquickevents.cpp
      src/quick/items/qquickevents_p_p.h
      src/quick/items/qquickwindow.cpp
      tests/auto/quick/touchmouse/tst_touchmouse.cpp

Change-Id: Id692d291455093fc72db61f1b854f3fc9190267b

1 files changed, 39 insertions, 0 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
new file mode 100644
index 0000000000..76f0910680
--- /dev/null
+++ b/tests/manual/scenegraph_lancelot/data/text/text_advance_multiparagraph.qml
@@ -0,0 +1,39 @@
+import QtQuick 2.0
+
+Item {
+    width: 320
+    height: 480
+
+    property string firstWord: "<p>One,</p><p>Two, "
+    property string secondWord: "Three</p>"
+
+    Text {
+        id: referenceText
+        text: firstWord + secondWord
+        anchors.centerIn: parent
+        font.italic: true
+        font.pixelSize: 30
+        textFormat: Text.RichText
+    }
+
+
+    Text {
+        id: firstWordItemRichText
+        anchors.left: referenceText.left
+        anchors.top: referenceText.bottom
+        text: firstWord
+        font: referenceText.font
+        textFormat: Text.RichText
+    }
+
+    Text {
+        id: secondWordItemRichText
+        anchors.left: firstWordItemRichText.left
+        anchors.leftMargin: firstWordItemRichText.advance.width
+        anchors.baseline: firstWordItemRichText.baseline
+        anchors.baselineOffset: firstWordItemRichText.advance.height
+        text: secondWord
+        font: referenceText.font
+        textFormat: Text.RichText
+    }
+}