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

Conflicts:
	src/quick/items/qquickimagebase.cpp
	src/imports/layouts/plugin.cpp

Change-Id: I5f48474df4034a1347ec74795c85d369a55b6b21

1 files changed, 22 insertions, 0 deletions

diff --git a/tests/manual/scenegraph_lancelot/data/text/textedit_multiline_selected_linebreaks_and_linewraps2.qml b/tests/manual/scenegraph_lancelot/data/text/textedit_multiline_selected_linebreaks_and_linewraps2.qml
new file mode 100644
index 0000000000..c16bc9cdf7
--- /dev/null
+++ b/tests/manual/scenegraph_lancelot/data/text/textedit_multiline_selected_linebreaks_and_linewraps2.qml
@@ -0,0 +1,22 @@
+import QtQuick 2.0
+
+Item {
+    width: 550
+    height: 480
+
+    TextEdit {
+        id: textEdit
+        anchors.centerIn: parent
+        width: 550
+        textFormat: TextEdit.RichText
+        text: "A<br />
+    This is a long message to demenostrate a text selection issue. I need to type some more text here. This is line 3<br />
+    This is a long message to demenostrate a text selection issue. I need to type some more text here. This is line 4"
+        wrapMode: TextEdit.Wrap
+
+        Component.onCompleted: {
+            textEdit.selectAll()
+        }
+    }
+
+}