From 902db8f33298dab3c9b7ae9733432d1a3e2af8e1 Mon Sep 17 00:00:00 2001
From: Andy Shaw <andy.shaw@qt.io>
Date: Thu, 4 Jun 2020 10:54:58 +0200
Subject: Remove the shortcut when the menu item that is using it is removed

Change-Id: I58ae027a6a913f45f7b3fad020c290c4d75804da
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit 6cadd6dc755b82f98bb4ff4f4336f63597d755b3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/imports/platform/qquickplatformmenuitem.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/imports/platform/qquickplatformmenuitem.cpp b/src/imports/platform/qquickplatformmenuitem.cpp
index 44f38e0f..b45a95aa 100644
--- a/src/imports/platform/qquickplatformmenuitem.cpp
+++ b/src/imports/platform/qquickplatformmenuitem.cpp
@@ -121,6 +121,16 @@ QQuickPlatformMenuItem::~QQuickPlatformMenuItem()
         m_menu->removeItem(this);
     if (m_group)
         m_group->removeItem(this);
+#if QT_CONFIG(shortcut)
+    if (m_shortcutId != -1) {
+        QKeySequence sequence;
+        if (m_shortcut.type() == QVariant::Int)
+            sequence = QKeySequence(static_cast<QKeySequence::StandardKey>(m_shortcut.toInt()));
+        else
+            sequence = QKeySequence::fromString(m_shortcut.toString());
+        QGuiApplicationPrivate::instance()->shortcutMap.removeShortcut(m_shortcutId, this, sequence);
+    }
+#endif
     delete m_iconLoader;
     m_iconLoader = nullptr;
     delete m_handle;
-- 
cgit v1.2.3