diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2011-09-06 11:08:48 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-06 11:08:48 +0200 |
| commit | a446ff945f4921e96dd366eb1f0eaa2d5f505428 (patch) | |
| tree | dff3014aeb9497e85dca1b65f45ee53e2602dab0 /src/widgets/widgets/qmenu_symbian.cpp | |
| parent | 665e4ec0ec959a12a6b66cdd0533bd40b29cd56d (diff) | |
| parent | a6b6e760ac2f019b9ca42847b9535207966811aa (diff) | |
Merge "Merge remote branch 'gerrit/master' into HEAD" into refactor
Diffstat (limited to 'src/widgets/widgets/qmenu_symbian.cpp')
| -rw-r--r-- | src/widgets/widgets/qmenu_symbian.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/widgets/qmenu_symbian.cpp b/src/widgets/widgets/qmenu_symbian.cpp index 56eca9a425..4250601f98 100644 --- a/src/widgets/widgets/qmenu_symbian.cpp +++ b/src/widgets/widgets/qmenu_symbian.cpp @@ -398,12 +398,12 @@ void QMenuPrivate::QSymbianMenuPrivate::rebuild(bool) { } -void QMenuBarPrivate::QSymbianMenuBarPrivate::addAction(QAction *a, QSymbianMenuAction *before) +void QMenuBarPrivate::QSymbianMenuBarPrivate::addAction(QAction *a, QAction *before) { QSymbianMenuAction *action = new QSymbianMenuAction; action->action = a; action->command = qt_symbian_menu_static_cmd_id++; - addAction(action, before); + addAction(action, findAction(before)); } void QMenuBarPrivate::QSymbianMenuBarPrivate::addAction(QSymbianMenuAction *action, QSymbianMenuAction *before) |