diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2013-04-03 13:03:37 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-03 13:14:52 +0200 |
| commit | 555a5ca61b9288108a6366552d4d263f1571104b (patch) | |
| tree | fac6cd038618d9714b8df0e2286f07a385cd05ff /src/plugins/platforms/cocoa | |
| parent | 448c3e85dddbfc5c101aceeeceb8584a3d41c913 (diff) | |
If the menu item is merged then we should not release it
When a menu item is merged then we do not want to release it as it will
cause a problem with the Application menu. Therefore we just hide it
instead.
Change-Id: Ia9f7acfe063001111769841c9a360cac369f7ed7
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoamenuitem.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoamenuitem.mm b/src/plugins/platforms/cocoa/qcocoamenuitem.mm index 40cffab3c9..dd99a6f3bc 100644 --- a/src/plugins/platforms/cocoa/qcocoamenuitem.mm +++ b/src/plugins/platforms/cocoa/qcocoamenuitem.mm @@ -104,9 +104,9 @@ QCocoaMenuItem::~QCocoaMenuItem() { if (m_merged) { [m_native setHidden:YES]; + } else { + [m_native release]; } - - [m_native release]; } void QCocoaMenuItem::setText(const QString &text) |