diff options
| author | Jan-Arve Saether <jan-arve.saether@nokia.com> | 2011-09-07 06:20:24 (GMT) |
|---|---|---|
| committer | Jan-Arve Saether <jan-arve.saether@nokia.com> | 2011-09-07 06:20:24 (GMT) |
| commit | 9d34e9d705cf2f054a668d9e6aafb2efcd500913 (patch) | |
| tree | 68f2b626e84ba9772c0e7c81e48a1e300421f145 /src/gui/widgets/qmenu_mac.mm | |
| parent | 80f9451b605aa2eb181d76b79bc1869a3cd9e513 (diff) | |
| parent | 3927585b3c74c8ccf61b84a525947237f02ea485 (diff) | |
| download | Qt-9d34e9d705cf2f054a668d9e6aafb2efcd500913.zip Qt-9d34e9d705cf2f054a668d9e6aafb2efcd500913.tar.gz Qt-9d34e9d705cf2f054a668d9e6aafb2efcd500913.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-team
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 9db068c..56658b3 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, QMacMenuAction *before) +QMenuBarPrivate::QMacMenuBarPrivate::addAction(QAction *a, QAction *before) { if (a->isSeparator() || !menu) return; @@ -1649,7 +1649,7 @@ QMenuBarPrivate::QMacMenuBarPrivate::addAction(QAction *a, QMacMenuAction *befor #ifndef QT_MAC_USE_COCOA action->command = qt_mac_menu_static_cmd_id++; #endif - addAction(action, before); + addAction(action, findAction(before)); } void |