diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2011-04-14 14:12:56 +0200 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-10 12:54:47 +0200 |
| commit | 95d7a4e8ea4e0bd6c6edad9749630ed4be3041ad (patch) | |
| tree | 9756f2db354d550b4e4651b514bdc646cd9a9d7c /src | |
| parent | 4bfcb2febe076a0fa65f03d0826ce46157de5876 (diff) | |
Build fix on QMenuBar
Reviewed-By: gabi
Merge-Request: 916
(cherry picked from commit ea585d567bf0970c57e31846da044295d80774ba)
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/widgets/qmenubar.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/qmenubarimpl.cpp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/widgets/qmenubar.cpp b/src/gui/widgets/qmenubar.cpp index 357c0fa092..a9684048c2 100644 --- a/src/gui/widgets/qmenubar.cpp +++ b/src/gui/widgets/qmenubar.cpp @@ -441,7 +441,7 @@ void QMenuBarPrivate::calcActionRects(int max_width, int start) const QSize sz; //calc what I think the size is.. - i f(action->isSeparator()) { + if (action->isSeparator()) { if (style->styleHint(QStyle::SH_DrawMenuBarSeparator, 0, q)) separator = i; continue; //we don't really position these! diff --git a/src/gui/widgets/qmenubarimpl.cpp b/src/gui/widgets/qmenubarimpl.cpp index d40250726b..db10c72975 100644 --- a/src/gui/widgets/qmenubarimpl.cpp +++ b/src/gui/widgets/qmenubarimpl.cpp @@ -120,12 +120,10 @@ void QMenuBarImpl::actionEvent(QActionEvent *e) void QMenuBarImpl::handleReparent(QWidget *oldParent, QWidget *newParent, QWidget *oldWindow, QWidget *newWindow) { -#ifdef Q_WS_X11 Q_UNUSED(oldParent) Q_UNUSED(newParent) Q_UNUSED(oldWindow) Q_UNUSED(newWindow) -#endif #ifdef Q_WS_MAC if (isNativeMenuBar() && !macWidgetHasNativeMenubar(newParent)) { |