diff options
| author | Morten Sorvig <morten.sorvig@nokia.com> | 2011-09-12 12:31:35 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-22 09:11:45 +0200 |
| commit | 91ec8261ab58061ca9e935c4e6a7f1c4a359cc27 (patch) | |
| tree | ddd0423a0d407c770c8bdb3b53f4b537a17553b0 /src/plugins/platforms/cocoa/qmenu_mac.mm | |
| parent | f82431b61c9e049ef1b22d8bd909369fe1f2636d (diff) | |
Cocoa: Enable native menus.
Fix menu duplication bug: make QCocoaMenu::addAction
do nothing before the native menu has ben created.
Change-Id: Ifca192421f2073264de9f5faeb053008ecb8532e
Reviewed-on: http://codereview.qt-project.org/5135
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa/qmenu_mac.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qmenu_mac.mm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qmenu_mac.mm b/src/plugins/platforms/cocoa/qmenu_mac.mm index 7ca546dd79..cfedf06daf 100644 --- a/src/plugins/platforms/cocoa/qmenu_mac.mm +++ b/src/plugins/platforms/cocoa/qmenu_mac.mm @@ -466,6 +466,9 @@ QCocoaMenu::~QCocoaMenu() void QCocoaMenu::addAction(QAction *a, QAction *before) { + if (menu == 0) + return; + QCocoaMenuAction *action = new QCocoaMenuAction; action->action = a; action->ignore_accel = 0; |