1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cocoa: Re-establish platform menu QObject hierarchy

Browse Source 
This amends commit 119882714f87ffeb6945fdb2d02997ae125ff50c.

Change-Id: Ifb105596af5b00b04344cb665b3e68292c9187ae
Reviewed-by: Romain Perier <romain.perier@gmail.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
This commit is contained in:
Gabriel de Dietrich 2013-06-27 18:41:31 +02:00 committed by The Qt Project
parent 658dfef500
commit e8c3316ab0
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/cocoa/qcocoamenu.mm
View File

@ -49,6 +49,7 @@
#include <QtGui/private/qguiapplication_p.h> #include <QtGui/private/qguiapplication_p.h>
#include "qcocoaapplication.h" #include "qcocoaapplication.h"
#include "qcocoamenuloader.h" #include "qcocoamenuloader.h"
#include "qcocoamenubar.h"
#include "qcocoawindow.h" #include "qcocoawindow.h"
#import "qnsview.h" #import "qnsview.h"
@ -538,6 +539,7 @@ void QCocoaMenu::syncModalState(bool modal)
void QCocoaMenu::setMenuBar(QCocoaMenuBar *menuBar) void QCocoaMenu::setMenuBar(QCocoaMenuBar *menuBar)
{ {
m_menuBar = menuBar; m_menuBar = menuBar;
setParent(menuBar);
} }
QCocoaMenuBar *QCocoaMenu::menuBar() const QCocoaMenuBar *QCocoaMenu::menuBar() const