Merge remote-tracking branch 'origin/release' into stable

Change-Id: I4c0ae2ac1c10d4d50c03625c802d981b7850ed6f

1 files changed, 27 insertions, 0 deletions

diff --git a/src/widgets/kernel/qshortcut.cpp b/src/widgets/kernel/qshortcut.cpp
index c5cdce3d60..471b054a99 100644
--- a/src/widgets/kernel/qshortcut.cpp
+++ b/src/widgets/kernel/qshortcut.cpp
@@ -51,6 +51,7 @@
 #include <private/qapplication_p.h>
 #include <private/qshortcutmap_p.h>
 #include <private/qaction_p.h>
+#include <private/qwidgetwindow_qpa_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -86,6 +87,20 @@ bool qWidgetShortcutContextMatcher(QObject *object, Qt::ShortcutContext context)
     if (QApplication::activePopupWidget())
         active_window = QApplication::activePopupWidget();
 
+    if (!active_window) {
+        QWindow *qwindow = QGuiApplication::focusWindow();
+        if (qwindow && qwindow->isActive()) {
+            while (qwindow) {
+                QWidgetWindow *widgetWindow = qobject_cast<QWidgetWindow *>(qwindow);
+                if (widgetWindow) {
+                    active_window = widgetWindow->widget();
+                    break;
+                }
+                qwindow = qwindow->parent();
+            }
+        }
+    }
+
     if (!active_window)
         return false;
 
@@ -106,6 +121,18 @@ bool qWidgetShortcutContextMatcher(QObject *object, Qt::ShortcutContext context)
             w = s->parentWidget();
     }
 
+    if (!w) {
+        QWindow *qwindow = qobject_cast<QWindow *>(object);
+        while (qwindow) {
+            QWidgetWindow *widget_window = qobject_cast<QWidgetWindow *>(qwindow);
+            if (widget_window) {
+                w = widget_window->widget();
+                break;
+            }
+            qwindow = qwindow->parent();
+        }
+    }
+
     if (!w)
         return false;