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

Conflicts:
	src/quicktemplates2/qquickswipedelegate.cpp
	tests/auto/controls/data/tst_swipedelegate.qml
	tests/auto/controls/data/tst_textarea.qml
	tests/auto/controls/data/tst_textfield.qml

Change-Id: I244f4ead4d14238c41db0bd965d7a2938f2ea8fc

1 files changed, 19 insertions, 0 deletions

diff --git a/tests/auto/controls/data/tst_textarea.qml b/tests/auto/controls/data/tst_textarea.qml
index 13bde08f..1c5c5cc8 100644
--- a/tests/auto/controls/data/tst_textarea.qml
+++ b/tests/auto/controls/data/tst_textarea.qml
@@ -366,4 +366,23 @@ TestCase {
 
         mouseArea.destroy()
     }
+
+    function test_multiClick() {
+        var control = textArea.createObject(testCase, {text: "Qt Quick Controls 2 TextArea", selectByMouse: true})
+        verify(control)
+
+        waitForRendering(control)
+        control.width = control.contentWidth
+        var rect = control.positionToRectangle(12)
+
+        // double click -> select word
+        mouseDoubleClickSequence(control, rect.x + rect.width / 2, rect.y + rect.height / 2)
+        compare(control.selectedText, "Controls")
+
+        // tripple click -> select whole line
+        mouseClick(control, rect.x + rect.width / 2, rect.y + rect.height / 2)
+        compare(control.selectedText, "Qt Quick Controls 2 TextArea")
+
+        control.destroy()
+    }
 }