diff options
| author | Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> | 2011-04-14 14:50:33 +0200 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-10 12:54:47 +0200 |
| commit | 9b609e1c05ea48028497f0a4aca7dae646053635 (patch) | |
| tree | 1e3c7a3c8ec695ff54a717ca35d46cbc8c0c1444 /src | |
| parent | d9cc2f8ff2d46cb6d69dcffb189845796ba1a17e (diff) | |
Reverting merge request 916
Revert "Build fix on QMenuBar"
This reverts commit ea585d567bf0970c57e31846da044295d80774ba.
(cherry picked from commit 68542b72f53f52df43063677e24994463872e81b)
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, 3 insertions, 1 deletions
diff --git a/src/gui/widgets/qmenubar.cpp b/src/gui/widgets/qmenubar.cpp index a9684048c2..357c0fa092 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.. - if (action->isSeparator()) { + i f(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 db10c72975..d40250726b 100644 --- a/src/gui/widgets/qmenubarimpl.cpp +++ b/src/gui/widgets/qmenubarimpl.cpp @@ -120,10 +120,12 @@ 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)) { |