From 2996ca031efcd97ef9866186ae53e96ed75c9fbf Mon Sep 17 00:00:00 2001
From: Volker Hilsheimer <volker.hilsheimer@qt.io>
Date: Mon, 16 May 2022 21:42:23 +0200
Subject: macOS: create application menu as QCocoaNSMenu with delegate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This way we can handle keyboard shortcuts for actions in that menu as
well in our menuHasKeyEquivalent implementation. This allows the focus
widget to accept the override, and e.g. a QKeySequenceEdit to record
Cmd+Q which with a plain NSMenu will just quit the application.

Pick-to: 6.3 6.2
Fixes: QTBUG-103590
Change-Id: I84597307aef8f0ab65d97d78e5aa15e5cf2e707d
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
 src/plugins/platforms/cocoa/qcocoamenuloader.mm | 2 +-
 src/plugins/platforms/cocoa/qcocoansmenu.h      | 1 +
 src/plugins/platforms/cocoa/qcocoansmenu.mm     | 7 +++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/plugins/platforms/cocoa')

diff --git a/src/plugins/platforms/cocoa/qcocoamenuloader.mm b/src/plugins/platforms/cocoa/qcocoamenuloader.mm
index 8357171776..6d3c668b87 100644
--- a/src/plugins/platforms/cocoa/qcocoamenuloader.mm
+++ b/src/plugins/platforms/cocoa/qcocoamenuloader.mm
@@ -56,7 +56,7 @@
         NSMenuItem *appItem = [[[NSMenuItem alloc] init] autorelease];
         appItem.title = appName;
         [theMenu addItem:appItem];
-        appMenu = [[NSMenu alloc] initWithTitle:appName];
+        appMenu = [[QCocoaNSMenu alloc] initWithoutPlatformMenu:appName];
         appItem.submenu = appMenu;
 
         // About Application
diff --git a/src/plugins/platforms/cocoa/qcocoansmenu.h b/src/plugins/platforms/cocoa/qcocoansmenu.h
index e2415d53c5..533aba1a21 100644
--- a/src/plugins/platforms/cocoa/qcocoansmenu.h
+++ b/src/plugins/platforms/cocoa/qcocoansmenu.h
@@ -28,6 +28,7 @@ QT_DECLARE_NAMESPACED_OBJC_INTERFACE(QCocoaNSMenuDelegate, NSObject <NSMenuDeleg
 QT_DECLARE_NAMESPACED_OBJC_INTERFACE(QCocoaNSMenu, NSMenu
 @property (readonly, nonatomic) QCocoaMenu *platformMenu;
 - (instancetype)initWithPlatformMenu:(QCocoaMenu *)menu;
+- (instancetype)initWithoutPlatformMenu:(NSString *)menu;
 )
 
 QT_DECLARE_NAMESPACED_OBJC_INTERFACE(QCocoaNSMenuItem, NSMenuItem
diff --git a/src/plugins/platforms/cocoa/qcocoansmenu.mm b/src/plugins/platforms/cocoa/qcocoansmenu.mm
index c6990b6b24..84a625ed66 100644
--- a/src/plugins/platforms/cocoa/qcocoansmenu.mm
+++ b/src/plugins/platforms/cocoa/qcocoansmenu.mm
@@ -51,6 +51,13 @@ static NSString *qt_mac_removePrivateUnicode(NSString *string)
     return self;
 }
 
+- (instancetype)initWithoutPlatformMenu:(NSString *)title
+{
+    if (self = [super initWithTitle:title])
+        self.delegate = [QCocoaNSMenuDelegate sharedMenuDelegate];
+    return self;
+}
+
 - (QCocoaMenu *)platformMenu
 {
     return _platformMenu.data();
-- 
cgit v1.2.3