diff options
author | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2011-01-25 21:12:07 (GMT) |
---|---|---|
committer | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2011-01-25 21:12:07 (GMT) |
commit | ab0a2466d7e3998caad226197355b729f523764a (patch) | |
tree | 710fe6abbf45e876b67abc401686932e478a52d9 /src/gui/widgets | |
parent | aeac5bf7cebb304eaf68bd7490294fc7021fe4c4 (diff) | |
download | Qt-ab0a2466d7e3998caad226197355b729f523764a.zip Qt-ab0a2466d7e3998caad226197355b729f523764a.tar.gz Qt-ab0a2466d7e3998caad226197355b729f523764a.tar.bz2 |
Cocoa: non-native toolbar shows in window when hidden
The reason is that we explicitly needs to tell it to hide which we do
in the init function. But since QToolBar overrides setVisible, this
fails. This patch makes sure we call the super version of the
function
Diffstat (limited to 'src/gui/widgets')
-rw-r--r-- | src/gui/widgets/qmenubar.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/widgets/qmenubar.cpp b/src/gui/widgets/qmenubar.cpp index dda5aba..5bfac9a 100644 --- a/src/gui/widgets/qmenubar.cpp +++ b/src/gui/widgets/qmenubar.cpp @@ -1073,8 +1073,11 @@ void QMenuBar::paintEvent(QPaintEvent *e) void QMenuBar::setVisible(bool visible) { #if defined(Q_WS_MAC) || defined(Q_OS_WINCE) || defined(Q_WS_S60) - if (isNativeMenuBar()) + if (isNativeMenuBar()) { + if (!visible) + QWidget::setVisible(false); return; + } #endif QWidget::setVisible(visible); } |