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

Conflicts:
	src/quickcontrols2/qquickchecklabel.cpp
	src/quickcontrols2/qquickchecklabel_p.h
	src/quickcontrols2/qquickmnemoniclabel_p.h
	src/quicktemplates2/qquickbuttongroup_p.h
	src/quicktemplates2/qquickspinbox.cpp
	src/quicktemplates2/qquickswipedelegate.cpp

Change-Id: I1278b78dcaf25be5698f34751193b83dc951eb3c

7 files changed, 105 insertions, 20 deletions

diff --git a/tests/auto/controls/data/tst_abstractbutton.qml b/tests/auto/controls/data/tst_abstractbutton.qml
index f4a89367..f71a3725 100644
--- a/tests/auto/controls/data/tst_abstractbutton.qml
+++ b/tests/auto/controls/data/tst_abstractbutton.qml
@@ -410,7 +410,7 @@ TestCase {
         verify(control)
 
         control.text = "&Hello"
-        compare(control.text, "Hello") // ### TODO: visualize mnemonics
+        compare(control.text, "&Hello")
 
         var clickSpy = signalSpy.createObject(control, {target: control, signalName: "clicked"})
         verify(clickSpy.valid)
@@ -427,7 +427,7 @@ TestCase {
         compare(clickSpy.count, 2)
 
         control.text = "Te&st"
-        compare(control.text, "Test") // ### TODO: visualize mnemonics
+        compare(control.text, "Te&st")
 
         keyClick(Qt.Key_H, Qt.AltModifier)
         compare(clickSpy.count, 2)
diff --git a/tests/auto/controls/data/tst_container.qml b/tests/auto/controls/data/tst_container.qml
index 94f22ad2..c5e74eeb 100644
--- a/tests/auto/controls/data/tst_container.qml
+++ b/tests/auto/controls/data/tst_container.qml
@@ -128,7 +128,7 @@ TestCase {
     }
 
     Component {
-        id: repeaterContainer
+        id: repeaterContainer1
         Container {
             id: container
             Item { objectName: "0" }
@@ -143,9 +143,33 @@ TestCase {
         }
     }
 
+    Component {
+        id: repeaterContainer2
+        Container {
+            id: container
+            contentItem: Item {
+                Repeater {
+                    model: container.contentModel
+                }
+                Rectangle { objectName: "extra" }
+            }
+            Rectangle { objectName: "0" }
+            Rectangle { objectName: "1" }
+            Rectangle { objectName: "2" }
+            Rectangle { objectName: "3" }
+        }
+    }
+
+    function test_repeater_data() {
+        return [
+            { tag: "1", component: repeaterContainer1 },
+            { tag: "2", component: repeaterContainer2 }
+        ]
+    }
+
     // don't crash (QTBUG-61310)
-    function test_repeater() {
-        var control = createTemporaryObject(repeaterContainer)
+    function test_repeater(data) {
+        var control = createTemporaryObject(data.component)
         verify(control)
 
         compare(control.itemAt(0).objectName, "0")
diff --git a/tests/auto/controls/data/tst_pageindicator.qml b/tests/auto/controls/data/tst_pageindicator.qml
index f3151882..dc411e45 100644
--- a/tests/auto/controls/data/tst_pageindicator.qml
+++ b/tests/auto/controls/data/tst_pageindicator.qml
@@ -122,18 +122,30 @@ TestCase {
         // test also clicking outside delegates => the nearest should be selected
         for (var i = 0; i < control.count; ++i) {
             var child = control.contentItem.children[i]
-            for (var x = -2; x <= child.width + 2; ++x) {
-                for (var y = -2; y <= child.height + 2; ++y) {
-                    control.currentIndex = -1
-                    compare(control.currentIndex, -1)
-
-                    var pos = control.mapFromItem(child, x, y)
-                    if (data.touch)
-                        touch.press(0, control, pos.x, pos.y).commit().release(0, control, pos.x, pos.y).commit()
-                    else
-                        mouseClick(control, pos.x, pos.y, Qt.LeftButton)
-                    compare(control.currentIndex, i)
-                }
+
+            var points = [
+                Qt.point(child.width / 2, -2), // top
+                Qt.point(-2, child.height / 2), // left
+                Qt.point(child.width + 2, child.height / 2), // right
+                Qt.point(child.width / 2, child.height + 2), // bottom
+
+                Qt.point(-2, -2), // top-left
+                Qt.point(child.width + 2, -2), // top-right
+                Qt.point(-2, child.height + 2), // bottom-left
+                Qt.point(child.width + 2, child.height + 2), // bottom-right
+            ]
+
+            for (var j = 0; j < points.length; ++j) {
+                control.currentIndex = -1
+                compare(control.currentIndex, -1)
+
+                var point = points[j]
+                var pos = control.mapFromItem(child, x, y)
+                if (data.touch)
+                    touch.press(0, control, pos.x, pos.y).commit().release(0, control, pos.x, pos.y).commit()
+                else
+                    mouseClick(control, pos.x, pos.y, Qt.LeftButton)
+                compare(control.currentIndex, i)
             }
         }
     }
diff --git a/tests/auto/controls/data/tst_scrollbar.qml b/tests/auto/controls/data/tst_scrollbar.qml
index a8d33cea..90fe9468 100644
--- a/tests/auto/controls/data/tst_scrollbar.qml
+++ b/tests/auto/controls/data/tst_scrollbar.qml
@@ -704,7 +704,7 @@ TestCase {
     }
 
     function test_overshoot() {
-        var container = flickable.createObject(testCase)
+        var container = createTemporaryObject(flickable, testCase)
         verify(container)
         waitForRendering(container)
 
@@ -733,8 +733,6 @@ TestCase {
         horizontal.position = 0.8
         compare(horizontal.contentItem.x, horizontal.leftPadding + 0.8 * horizontal.availableWidth)
         compare(horizontal.contentItem.width, 0.2 * horizontal.availableWidth)
-
-        container.destroy()
     }
 
     function test_orientation() {
diff --git a/tests/auto/controls/data/tst_spinbox.qml b/tests/auto/controls/data/tst_spinbox.qml
index a1d1b7ba..9568da1a 100644
--- a/tests/auto/controls/data/tst_spinbox.qml
+++ b/tests/auto/controls/data/tst_spinbox.qml
@@ -367,6 +367,9 @@ TestCase {
         var control = createTemporaryObject(spinBox, testCase)
         verify(control)
 
+        var valueModifiedSpy = signalSpy.createObject(control, {target: control, signalName: "valueModified"})
+        verify(valueModifiedSpy.valid)
+
         control.contentItem.forceActiveFocus()
         compare(control.contentItem.activeFocus, true)
 
@@ -375,6 +378,7 @@ TestCase {
         keyClick(Qt.Key_5)
         keyClick(Qt.Key_Return)
         compare(control.value, 0)
+        compare(valueModifiedSpy.count, 0)
 
         control.editable = true
         compare(control.editable, true)
@@ -382,6 +386,7 @@ TestCase {
         keyClick(Qt.Key_5)
         keyClick(Qt.Key_Return)
         compare(control.value, 5)
+        compare(valueModifiedSpy.count, 1)
     }
 
     function test_wheel_data() {
diff --git a/tests/auto/controls/data/tst_textfield.qml b/tests/auto/controls/data/tst_textfield.qml
index 6a40f053..0fee7363 100644
--- a/tests/auto/controls/data/tst_textfield.qml
+++ b/tests/auto/controls/data/tst_textfield.qml
@@ -420,4 +420,19 @@ TestCase {
         mouseClick(control, rect.x + rect.width / 2, rect.y + rect.height / 2)
         compare(control.selectedText, "Qt Quick Controls 2 TextArea")
     }
+
+    // QTBUG-64048
+    function test_rightClick() {
+        var control = createTemporaryObject(textField, testCase, {text: "TextField", selectByMouse: true})
+        verify(control)
+
+        control.selectAll()
+        compare(control.selectedText, "TextField")
+
+        mouseClick(control, control.width / 2, control.height / 2, Qt.RightButton)
+        compare(control.selectedText, "TextField")
+
+        mouseClick(control, control.width / 2, control.height / 2, Qt.LeftButton | Qt.RightButton)
+        compare(control.selectedText, "")
+    }
 }
diff --git a/tests/auto/controls/data/tst_tooltip.qml b/tests/auto/controls/data/tst_tooltip.qml
index bd46fabd..e7cc6787 100644
--- a/tests/auto/controls/data/tst_tooltip.qml
+++ b/tests/auto/controls/data/tst_tooltip.qml
@@ -298,4 +298,35 @@ TestCase {
         keyPress(Qt.Key_A)
         compare(shortcutActivatedSpy.count, 1)
     }
+
+    Component {
+        id: hoverComponent
+        MouseArea {
+            id: hoverArea
+            property alias tooltip: tooltip
+            hoverEnabled: true
+            width: testCase.width
+            height: testCase.height
+            ToolTip {
+                id: tooltip
+                x: 10; y: 10
+                width: 10; height: 10
+                visible: hoverArea.containsMouse
+            }
+        }
+    }
+
+    // QTBUG-63644
+    function test_hover() {
+        var root = createTemporaryObject(hoverComponent, testCase)
+        verify(root)
+
+        var tooltip = root.tooltip
+        verify(tooltip)
+
+        for (var pos = 0; pos <= 25; pos += 5) {
+            mouseMove(root, pos, pos)
+            verify(tooltip.visible)
+        }
+    }
 }