diff options
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaintegration.mm | 8 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qmenu_mac.mm | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm index e3e204226f..bb17c8eef7 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.mm +++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm @@ -83,6 +83,8 @@ QCocoaIntegration::QCocoaIntegration() { mPool = new QCocoaAutoReleasePool; + qApp->setAttribute(Qt::AA_DontUseNativeMenuBar, false); + QNSApplication *cocoaApplication = [QNSApplication sharedApplication]; // Applications launched from plain executables (without an app @@ -166,14 +168,12 @@ QPlatformFontDatabase *QCocoaIntegration::fontDatabase() const QPlatformMenu *QCocoaIntegration::createPlatformMenu(QMenu *menu) const { - // return new QCocoaMenu(menu); - return 0; + return new QCocoaMenu(menu); } QPlatformMenuBar *QCocoaIntegration::createPlatformMenuBar(QMenuBar *menuBar) const { - //return new QCocoaMenuBar(menuBar); - return 0; + return new QCocoaMenuBar(menuBar); } QPlatformNativeInterface *QCocoaIntegration::nativeInterface() const 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; |