diff options
author | Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> | 2011-04-15 10:04:05 (GMT) |
---|---|---|
committer | Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> | 2011-04-15 10:04:05 (GMT) |
commit | 443d5b17619002cd6bb428198c453271a01accab (patch) | |
tree | 350a3b2370b02c42e26f6c149a80e75137a2831d /src/gui/widgets/qmenu_mac.mm | |
parent | bc16ebdb7aeff70fe8149297183636ea7fd14ed1 (diff) | |
download | Qt-443d5b17619002cd6bb428198c453271a01accab.zip Qt-443d5b17619002cd6bb428198c453271a01accab.tar.gz Qt-443d5b17619002cd6bb428198c453271a01accab.tar.bz2 |
Totally kill MR 916
... the hard way.
Reviewed-by: Trust me
Diffstat (limited to 'src/gui/widgets/qmenu_mac.mm')
-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 f780ee7..2977558 100644 --- a/src/gui/widgets/qmenu_mac.mm +++ b/src/gui/widgets/qmenu_mac.mm @@ -1639,7 +1639,7 @@ QMenuBarPrivate::QMacMenuBarPrivate::~QMacMenuBarPrivate() } void -QMenuBarPrivate::QMacMenuBarPrivate::addAction(QAction *a, QAction *before) +QMenuBarPrivate::QMacMenuBarPrivate::addAction(QAction *a, QMacMenuAction *before) { if (a->isSeparator() || !menu) return; @@ -1649,7 +1649,7 @@ QMenuBarPrivate::QMacMenuBarPrivate::addAction(QAction *a, QAction *before) #ifndef QT_MAC_USE_COCOA action->command = qt_mac_menu_static_cmd_id++; #endif - addAction(action, findAction(before)); + addAction(action, before); } void |