diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-11-09 10:46:57 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-11-09 10:46:57 (GMT) |
| commit | 683cca297d29e7ea9f84c087a3c081dcccea48fb (patch) | |
| tree | 88ca39218e1fedf94751b927d7e04944a4c66e16 /src/gui/widgets/qmenu_mac.mm | |
| parent | 338fe3c15e90d62606806b0845bb621dd05153ae (diff) | |
| parent | fa7f6e542b8381dd3af525507cd6e0a3ee43b813 (diff) | |
| download | Qt-683cca297d29e7ea9f84c087a3c081dcccea48fb.zip Qt-683cca297d29e7ea9f84c087a3c081dcccea48fb.tar.gz Qt-683cca297d29e7ea9f84c087a3c081dcccea48fb.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts:
src/gui/kernel/qwidget_win.cpp
Diffstat (limited to 'src/gui/widgets/qmenu_mac.mm')
| -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 b238faf..9510cc6 100644 --- a/src/gui/widgets/qmenu_mac.mm +++ b/src/gui/widgets/qmenu_mac.mm @@ -1191,7 +1191,7 @@ QMenuPrivate::QMacMenuPrivate::addAction(QMacMenuAction *action, QMacMenuAction #endif } - QWidget *widget = qmenu ? qmenu->widgetItems.value(qmenu->actions.indexOf(action->action)) : 0; + QWidget *widget = qmenu ? qmenu->widgetItems.value(action->action) : 0; if (widget) { #ifndef QT_MAC_USE_COCOA ChangeMenuAttributes(action->menu, kMenuAttrDoNotCacheImage, 0); |