diff options
| author | Jens Bache-Wiig <jens.bache-wiig@digia.com> | 2013-11-18 17:35:18 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-21 07:29:35 +0100 |
| commit | cd61eacae12ed89ceb82b59d3813f5c79e778821 (patch) | |
| tree | e802ea0098e7015c575b43a0afc0a205600f9a5e | |
| parent | a695371b8faa6a043c304859a298a81c1d408bd0 (diff) | |
| download | qtbase-cd61eacae12ed89ceb82b59d3813f5c79e778821.tar.gz | |
Fix crash regression for ApplicationWindow on Mac
This fixes a recent regression following the integration of
change:
7cc1656fef21e6bdc044968a79f0a41155357c29
(Make sure menu bar has a parent window ...)
As it now consistently crashes on mac in several of the
Qt Quick Controls examples, it is critical that it gets into
the release branch.
Change-Id: If3db1025229a7f7fd4e7ecc703d5f655db73964d
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoamenubar.mm | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoamenubar.mm b/src/plugins/platforms/cocoa/qcocoamenubar.mm index 0fea55ac68..5a8664747e 100644 --- a/src/plugins/platforms/cocoa/qcocoamenubar.mm +++ b/src/plugins/platforms/cocoa/qcocoamenubar.mm @@ -175,6 +175,7 @@ void QCocoaMenuBar::handleReparent(QWindow *newParentWindow) if (newParentWindow == NULL) { m_window = NULL; } else { + newParentWindow->create(); m_window = static_cast<QCocoaWindow*>(newParentWindow->handle()); m_window->setMenubar(this); } |