From b8246f08e49eb672974fd3d3d972a5ff13c1524d Mon Sep 17 00:00:00 2001 From: James Turner Date: Fri, 4 May 2012 14:16:05 +0100 Subject: Cocoa implementation of QPA menu interface. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Implement the QPA platform menu interface for Cocoa, including native menubar support and merging with the predefined menus created from the bundled .nib. Cleanup code previously used to maintain the menus, and add a manual test of the menus code. Change-Id: Ia99267ddb6485e18e05c540eb32c5aee6cbb85db Reviewed-by: Morten Johan Sørvig --- src/plugins/platforms/cocoa/qcocoaapplication.mm | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'src/plugins/platforms/cocoa/qcocoaapplication.mm') diff --git a/src/plugins/platforms/cocoa/qcocoaapplication.mm b/src/plugins/platforms/cocoa/qcocoaapplication.mm index 2cecb296f4..90f09aa620 100644 --- a/src/plugins/platforms/cocoa/qcocoaapplication.mm +++ b/src/plugins/platforms/cocoa/qcocoaapplication.mm @@ -189,17 +189,6 @@ QT_USE_NAMESPACE [super sendEvent:event]; } -- (void)qtDispatcherToQAction:(id)sender -{ - // Forward actions sent from the menu bar (e.g. quit) to the menu loader. - // Having this method here means that we are the last stop in the responder - // chain, and that we are able to handle menu actions even when no window is - // visible on screen. Note: If Qt is used as a plugin, Qt will not use a - // native menu bar. Hence, we will also not need to do any redirection etc. as - // we do with sendEvent. - [[NSApp QT_MANGLE_NAMESPACE(qt_qcocoamenuLoader)] qtDispatcherToQAction:sender]; -} - @end QT_BEGIN_NAMESPACE -- cgit v1.2.3