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

Conflicts:
	src/quickcontrols2/qquickstyle.cpp
	tests/auto/controls/data/tst_popup.qml

Change-Id: I7b7bb5f9c63b32eef65c9b2e68f56baa3da69cff

1 files changed, 35 insertions, 0 deletions

diff --git a/tests/auto/controls/data/tst_popup.qml b/tests/auto/controls/data/tst_popup.qml
index 0712b82b..dbea7496 100644
--- a/tests/auto/controls/data/tst_popup.qml
+++ b/tests/auto/controls/data/tst_popup.qml
@@ -1341,4 +1341,39 @@ TestCase {
         // TODO: do this properly by creating a component or something
         applicationWindow.visible = false
     }
+
+    Component {
+        id: shortcutWindowComponent
+        ApplicationWindow {
+            id: window
+            width: 360
+            height: 360
+            visible: true
+
+            property alias popup: popup
+
+            Popup {
+                id: popup
+
+                Shortcut {
+                    sequence: "Tab"
+                    onActivated: popup.visible = !popup.visible
+                }
+            }
+        }
+    }
+
+    function test_shortcut() {
+        // Tests that a Shortcut with Qt.WindowShortcut context
+        // that is declared within a Popup is activated.
+        var window = createTemporaryObject(shortcutWindowComponent, testCase)
+        var control = window.popup
+
+        waitForRendering(window.contentItem)
+        keyClick(Qt.Key_Tab)
+        tryCompare(control, "visible", true)
+
+        keyClick(Qt.Key_Tab)
+        tryCompare(control, "visible", false)
+    }
 }