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

Change-Id: I7c0333dbf959124f6cf5be7837a305b65c08d290

3 files changed, 37 insertions, 0 deletions

diff --git a/tests/auto/controls/data/tst_action.qml b/tests/auto/controls/data/tst_action.qml
index 7d057c26..35e65202 100644
--- a/tests/auto/controls/data/tst_action.qml
+++ b/tests/auto/controls/data/tst_action.qml
@@ -137,4 +137,32 @@ TestCase {
         keyClick(Qt.Key_B, Qt.ControlModifier)
         compare(container.lastSource, container.action)
     }
+
+    Component {
+        id: actionAndRepeater
+        Item {
+            property alias action: testAction
+            Action {
+                id: testAction
+                shortcut: "Ctrl+A"
+            }
+            Repeater {
+                model: 1
+                Button {
+                    action: testAction
+                }
+            }
+        }
+    }
+
+    function test_repeater() {
+        var container = createTemporaryObject(actionAndRepeater, testCase)
+        verify(container)
+
+        var spy = signalSpy.createObject(container, {target: container.action, signalName: "triggered"})
+        verify(spy.valid)
+
+        keyClick(Qt.Key_A, Qt.ControlModifier)
+        compare(spy.count, 1)
+    }
 }
diff --git a/tests/auto/controls/data/tst_popup.qml b/tests/auto/controls/data/tst_popup.qml
index 88ec295f..3f9f5e48 100644
--- a/tests/auto/controls/data/tst_popup.qml
+++ b/tests/auto/controls/data/tst_popup.qml
@@ -1261,4 +1261,12 @@ TestCase {
         control.open()
         verify(control.visible)
     }
+
+    function test_deferredBackgroundSize() {
+        var control = createTemporaryObject(popupControl, testCase, {width: 200, height: 100})
+        verify(control)
+
+        compare(control.background.width, 200 + (control.background.leftInset || 0) + (control.background.rightInset || 0))
+        compare(control.background.height, 100 + (control.background.topInset || 0) + (control.background.bottomInset || 0))
+    }
 }
diff --git a/tests/auto/controls/data/tst_tumbler.qml b/tests/auto/controls/data/tst_tumbler.qml
index 03908566..058cbeca 100644
--- a/tests/auto/controls/data/tst_tumbler.qml
+++ b/tests/auto/controls/data/tst_tumbler.qml
@@ -349,6 +349,7 @@ TestCase {
         verify(firstItem);
         // Test QTBUG-40298.
         actualPos = testCase.mapFromItem(firstItem, 0, 0);
+        tryCompare(tumbler, "moving", false);
         fuzzyCompare(actualPos.x, tumbler.leftPadding, 0.0001);
         fuzzyCompare(actualPos.y, tumbler.topPadding, 0.0001);