Reverting merge request 916

Revert "Build fix on QMenuBar"

This reverts commit ea585d567bf0970c57e31846da044295d80774ba.
(cherry picked from commit 68542b72f53f52df43063677e24994463872e81b)

diff --git a/src/gui/widgets/qmenubar.cpp b/src/gui/widgets/qmenubar.cpp
index a968404..357c0fa 100644 (file)
--- 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 db10c72..d402507 100644 (file)
--- 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)) {