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

Change-Id: Ia5d3c9705e5832df76bb55753dcf38e340afc5b2

2 files changed, 32 insertions, 0 deletions

diff --git a/tests/auto/controls/data/tst_label.qml b/tests/auto/controls/data/tst_label.qml
index 5618fe07..69d273a7 100644
--- a/tests/auto/controls/data/tst_label.qml
+++ b/tests/auto/controls/data/tst_label.qml
@@ -66,6 +66,18 @@ TestCase {
     }
 
     Component {
+        id: backgroundLabel
+        Label {
+            background: Rectangle { }
+        }
+    }
+
+    Component {
+        id: rectangle
+        Rectangle { }
+    }
+
+    Component {
         id: signalSpy
         SignalSpy { }
     }
@@ -115,4 +127,16 @@ TestCase {
         compare(child.font[data.tag], defaultValue)
         compare(childSpy.count, 0)
     }
+
+    function test_background() {
+        var control = createTemporaryObject(backgroundLabel, testCase, {text: "Label"})
+        verify(control)
+
+        compare(control.background.width, control.width)
+        compare(control.background.height, control.height)
+
+        control.background = rectangle.createObject(control)
+        compare(control.background.width, control.width)
+        compare(control.background.height, control.height)
+    }
 }
diff --git a/tests/auto/controls/data/tst_popup.qml b/tests/auto/controls/data/tst_popup.qml
index dbea7496..9ff01e40 100644
--- a/tests/auto/controls/data/tst_popup.qml
+++ b/tests/auto/controls/data/tst_popup.qml
@@ -1351,11 +1351,13 @@ TestCase {
             visible: true
 
             property alias popup: popup
+            property alias shortcut: shortcut
 
             Popup {
                 id: popup
 
                 Shortcut {
+                    id: shortcut
                     sequence: "Tab"
                     onActivated: popup.visible = !popup.visible
                 }
@@ -1369,11 +1371,17 @@ TestCase {
         var window = createTemporaryObject(shortcutWindowComponent, testCase)
         var control = window.popup
 
+        var shortcutActivatedSpy = createTemporaryObject(signalSpy, testCase,
+            { target: window.shortcut, signalName: "activated"} )
+        verify(shortcutActivatedSpy.valid)
+
         waitForRendering(window.contentItem)
         keyClick(Qt.Key_Tab)
+        compare(shortcutActivatedSpy.count, 1)
         tryCompare(control, "visible", true)
 
         keyClick(Qt.Key_Tab)
+        compare(shortcutActivatedSpy.count, 2)
         tryCompare(control, "visible", false)
     }
 }