QQuickAction: don't grab the same shortcut multiple times

If the entry for the QQuickItem that the QQuickAction is set on has
already grabbed the shortcut, then m_shortcutId is no longer 0 and we
must not overwrite the value. Otherwise, the QQuickItem removing itself
from the action might not remove the correct entry from Qt's shortcut
map, leaving a dangling pointer behind.

Multiple calls to QQuickActionPrivate::ShortcutEntry::grab are possible,
because we grab the shortcut whenever the shortcut changes, or when an
item representing the action becomes visible.

The test case added reproduces this scenario by adding the action to a
menu item and then making the menu explicitly visible, resulting in two
calls to grab() which should be idempotent.

Fixes: QTBUG-96551
Fixes: QTBUG-96561
Change-Id: I7d42a4f4c04f7d8759f2d0f24a133720f10e4c47
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

1 files changed, 33 insertions, 0 deletions

diff --git a/tests/auto/controls/data/tst_action.qml b/tests/auto/controls/data/tst_action.qml
index 0e41b7f3..7ed4aa11 100644
--- a/tests/auto/controls/data/tst_action.qml
+++ b/tests/auto/controls/data/tst_action.qml
@@ -194,4 +194,37 @@ TestCase {
         verify(container)
         compare(container.indirect.nativeText, container.direct.nativeText);
     }
+
+    Component {
+        id: shortcutCleanup
+        Item {
+            property alias page: page
+            property alias action: action
+            property alias menu: menu
+            Item {
+                id: page
+                Action {
+                    id: action
+                    text: "action"
+                    shortcut: "Insert"
+                }
+                Menu {
+                    id: menu
+                    MenuItem { action: action }
+                }
+            }
+        }
+    }
+
+    function test_shortcutCleanup() {
+        {
+            var container = createTemporaryObject(shortcutCleanup, testCase);
+            verify(container)
+            container.action.shortcut = "Delete"
+            container.menu.open()
+            container.page.destroy()
+            tryVerify(function() { return !container.page })
+        }
+        keyClick(Qt.Key_Delete, Qt.NoModifier)
+    }
 }