summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabien Freling <fabien.freling@nokia.com>2010-04-16 12:27:57 (GMT)
committerFabien Freling <fabien.freling@nokia.com>2010-04-16 12:28:23 (GMT)
commite2c776862cb9bdf5b651c15934f7e92fe11b989b (patch)
tree8e53a2bf0661fc63c5c99f51ee80c3e5669094a5
parent26b9ca7189676b6afd055ec64fc211afaf652f7f (diff)
downloadQt-e2c776862cb9bdf5b651c15934f7e92fe11b989b.zip
Qt-e2c776862cb9bdf5b651c15934f7e92fe11b989b.tar.gz
Qt-e2c776862cb9bdf5b651c15934f7e92fe11b989b.tar.bz2
Fix menu bar visibility.
We no longer show the menu bar if it is not native and doesn't have a parent widget.
-rw-r--r--src/gui/widgets/qmenubar.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/widgets/qmenubar.cpp b/src/gui/widgets/qmenubar.cpp
index a13a2fa..ef37fd1 100644
--- a/src/gui/widgets/qmenubar.cpp
+++ b/src/gui/widgets/qmenubar.cpp
@@ -1931,9 +1931,9 @@ void QMenuBar::setNativeMenuBar(bool nativeMenuBar)
d->macCreateMenuBar(parentWidget());
}
macUpdateMenuBar();
- updateGeometry();
- setVisible(false);
- setVisible(true);
+ updateGeometry();
+ if (!d->nativeMenuBar && parentWidget())
+ setVisible(true);
#endif
}
}