Fix Action shortcuts in Repeater

QQuickRepeater does not set a QObject-parent, so make
QQuickShortcutContext::matcher() start from the object itself and
if no window is found, then iterate to the QObject parents.

Task-number: QTBUG-65889
Change-Id: I30a1ed0616edd002abcf28d1b8dc7e2d87e99c13
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 3 insertions, 1 deletions

diff --git a/src/quicktemplates2/qquickshortcutcontext.cpp b/src/quicktemplates2/qquickshortcutcontext.cpp
index b491cab2..e94de722 100644
--- a/src/quicktemplates2/qquickshortcutcontext.cpp
+++ b/src/quicktemplates2/qquickshortcutcontext.cpp
@@ -76,14 +76,16 @@ bool QQuickShortcutContext::matcher(QObject *obj, Qt::ShortcutContext context)
         return true;
     case Qt::WindowShortcut:
         while (obj && !obj->isWindowType()) {
-            obj = obj->parent();
             item = qobject_cast<QQuickItem *>(obj);
             if (item) {
                 obj = item->window();
+                break;
             } else if (QQuickPopup *popup = qobject_cast<QQuickPopup *>(obj)) {
                 obj = popup->window();
                 item = popup->popupItem();
+                break;
             }
+            obj = obj->parent();
         }
         if (QWindow *renderWindow = QQuickRenderControl::renderWindowFor(qobject_cast<QQuickWindow *>(obj)))
             obj = renderWindow;