diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-08 09:27:37 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-08 09:27:38 +0100 |
| commit | 332ce6734d29fb03852d04de6bc648289ff1c35d (patch) | |
| tree | 30713dba37e3a98c7606c18f044ab4a815863288 /src/plugins/platforms/cocoa/qcocoamenu.mm | |
| parent | 2056bc6bc51efa1da61098ba3d213a4e25d9e7d8 (diff) | |
| parent | caa5a20479bd58fda4380181691f772a1f3c1da4 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Idf471ca5c6cf211813466b539ce45bdc1ae9b97c
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoamenu.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoamenu.mm | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoamenu.mm b/src/plugins/platforms/cocoa/qcocoamenu.mm index 148dad5d6c..49b3e76606 100644 --- a/src/plugins/platforms/cocoa/qcocoamenu.mm +++ b/src/plugins/platforms/cocoa/qcocoamenu.mm @@ -132,9 +132,8 @@ void QCocoaMenu::insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem * void QCocoaMenu::insertNative(QCocoaMenuItem *item, QCocoaMenuItem *beforeItem) { + setItemTargetAction(item); NSMenuItem *nativeItem = item->nsItem(); - nativeItem.target = m_nativeMenu.delegate; - nativeItem.action = @selector(itemFired:); // Someone's adding new items after aboutToShow() was emitted if (isOpen() && nativeItem && item->menu()) item->menu()->setAttachedItem(nativeItem); @@ -494,4 +493,11 @@ NSMenuItem *QCocoaMenu::attachedItem() const return m_attachedItem; } +void QCocoaMenu::setItemTargetAction(QCocoaMenuItem *item) const +{ + auto *nsItem = item->nsItem(); + nsItem.target = m_nativeMenu; + nsItem.action = @selector(qt_itemFired:); +} + QT_END_NAMESPACE |