diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-23 17:01:30 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-23 17:01:30 (GMT) |
| commit | 27f96458ba40dcbf5db4df0b0e553ca5799a13c4 (patch) | |
| tree | 51903070ae0fa3afa89dce2e128f9e8e5fbb6f0e /src/gui/widgets | |
| parent | 15088d236924bccee787953e04214f87392e8e55 (diff) | |
| parent | 466d7562a40eb0c2cf72f57fce0bc5e9b0de37c2 (diff) | |
| download | Qt-27f96458ba40dcbf5db4df0b0e553ca5799a13c4.zip Qt-27f96458ba40dcbf5db4df0b0e553ca5799a13c4.tar.gz Qt-27f96458ba40dcbf5db4df0b0e553ca5799a13c4.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
qdoc: Removed nested <ul> elements from the TOC
Diacritic input broken, duplicate the base glypha (on Mac OS X carbon)
Cocoa: quiting the app from the menubar may cause a crash
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/qmenu_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qmenu_mac.mm b/src/gui/widgets/qmenu_mac.mm index 7645c23..e8400d6 100644 --- a/src/gui/widgets/qmenu_mac.mm +++ b/src/gui/widgets/qmenu_mac.mm @@ -1831,7 +1831,7 @@ void QMenuBarPrivate::macDestroyMenuBar() menubars()->remove(tlw); mac_menubar = 0; - if (qt_mac_current_menubar.qmenubar == q) { + if (!qt_mac_current_menubar.qmenubar || qt_mac_current_menubar.qmenubar == q) { #ifdef QT_MAC_USE_COCOA QT_MANGLE_NAMESPACE(QCocoaMenuLoader) *loader = getMenuLoader(); [loader removeActionsFromAppMenu]; |