summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSatyam Bandarapu <satyam.bandarapu@nokia.com>2011-12-15 09:15:15 (GMT)
committerSatyam Bandarapu <satyam.bandarapu@nokia.com>2011-12-15 10:02:18 (GMT)
commitba3f5ec3884aafb6c9761ef8719b82d4345245fa (patch)
tree3d1be0b1601952c519cb05cc8d426d4c902fcfd5
parentb249e4c32d697ef56c196bb2a14a18319100f127 (diff)
downloadQt-ba3f5ec3884aafb6c9761ef8719b82d4345245fa.zip
Qt-ba3f5ec3884aafb6c9761ef8719b82d4345245fa.tar.gz
Qt-ba3f5ec3884aafb6c9761ef8719b82d4345245fa.tar.bz2
Symbian: fix tst_QMenuBar::task256322_highlight() regression
This fixes Symbian-only regression caused by ab0a2466d7e3998caad226197355b729f523764a. Reviewed-by: Miikka Heikkinen
-rw-r--r--src/gui/widgets/qmenubar.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/widgets/qmenubar.cpp b/src/gui/widgets/qmenubar.cpp
index 3e5365c..ec79237 100644
--- a/src/gui/widgets/qmenubar.cpp
+++ b/src/gui/widgets/qmenubar.cpp
@@ -1111,8 +1111,10 @@ void QMenuBar::setVisible(bool visible)
#else
#if defined(Q_WS_MAC) || defined(Q_OS_WINCE) || defined(Q_WS_S60)
if (isNativeMenuBar()) {
+#ifndef Q_WS_S60
if (!visible)
QWidget::setVisible(false);
+#endif
return;
}
#endif