diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2013-06-27 18:41:31 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-02 13:44:10 +0200 |
| commit | e8c3316ab03584fe18e4e2d49fcb1a70a7231d16 (patch) | |
| tree | 6124a95edd196b06f72f5500807fc633cd2d4606 /src/plugins/platforms/cocoa | |
| parent | 658dfef50085cbf7ac1157528d0ccc2b8a698c34 (diff) | |
Cocoa: Re-establish platform menu QObject hierarchy
This amends commit 119882714f87ffeb6945fdb2d02997ae125ff50c.
Change-Id: Ifb105596af5b00b04344cb665b3e68292c9187ae
Reviewed-by: Romain Perier <romain.perier@gmail.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoamenu.mm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoamenu.mm b/src/plugins/platforms/cocoa/qcocoamenu.mm index d4cf83a380..bd406ee176 100644 --- a/src/plugins/platforms/cocoa/qcocoamenu.mm +++ b/src/plugins/platforms/cocoa/qcocoamenu.mm @@ -49,6 +49,7 @@ #include <QtGui/private/qguiapplication_p.h> #include "qcocoaapplication.h" #include "qcocoamenuloader.h" +#include "qcocoamenubar.h" #include "qcocoawindow.h" #import "qnsview.h" @@ -538,6 +539,7 @@ void QCocoaMenu::syncModalState(bool modal) void QCocoaMenu::setMenuBar(QCocoaMenuBar *menuBar) { m_menuBar = menuBar; + setParent(menuBar); } QCocoaMenuBar *QCocoaMenu::menuBar() const |