diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-15 13:24:16 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-15 13:24:16 (GMT) |
| commit | b61d07fc4ad33193d67ac771e7266b43ea6a859b (patch) | |
| tree | f06f39d2668f8ebf926de252d30f60d119d6b4ed /src/gui/widgets | |
| parent | 0417dd8dacb8b6123df10c947af396bed1ade82f (diff) | |
| parent | 2eb373a68367a6511e12d60034e920345431bcc8 (diff) | |
| download | Qt-b61d07fc4ad33193d67ac771e7266b43ea6a859b.zip Qt-b61d07fc4ad33193d67ac771e7266b43ea6a859b.tar.gz Qt-b61d07fc4ad33193d67ac771e7266b43ea6a859b.tar.bz2 | |
Merge commit 'origin/4.5' into origin/4.6
Conflicts:
src/gui/kernel/qcocoaview_mac.mm
src/network/access/qhttpnetworkconnection.cpp
src/opengl/qgl_qws.cpp
src/opengl/qglpixelbuffer_egl.cpp
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/qmenu_mac.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/widgets/qmenu_mac.mm b/src/gui/widgets/qmenu_mac.mm index 4fc3d3d..cee38ee 100644 --- a/src/gui/widgets/qmenu_mac.mm +++ b/src/gui/widgets/qmenu_mac.mm @@ -1425,7 +1425,7 @@ QMenuPrivate::QMacMenuPrivate::syncAction(QMacMenuAction *action) SetMenuItemProperty(data.submenuHandle, 0, kMenuCreatorQt, kMenuPropertyCausedQWidget, sizeof(caused), &caused); #else NSMenu *subMenu = static_cast<NSMenu *>(action->action->menu()->macMenu()); - if ([subMenu supermenu] != nil) { + if ([subMenu supermenu] && [subMenu supermenu] != [item menu]) { // The menu is already a sub-menu of another one. Cocoa will throw an exception, // in such cases. For the time being, a new QMenu with same set of actions is the // only workaround. @@ -1718,7 +1718,7 @@ QMenuBarPrivate::QMacMenuBarPrivate::syncAction(QMacMenuAction *action) GetMenuItemProperty(action->menu, 0, kMenuCreatorQt, kMenuPropertyQWidget, sizeof(caused), 0, &caused); SetMenuItemProperty(submenu, 0, kMenuCreatorQt, kMenuPropertyCausedQWidget, sizeof(caused), &caused); #else - if ([submenu supermenu] != nil) + if ([submenu supermenu] && [submenu supermenu] != [item menu]) return; else [item setSubmenu:submenu]; |