diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-15 10:11:25 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-15 10:11:25 (GMT) |
| commit | afa0b42ba94de7533521ae705bdd1762fea9f50b (patch) | |
| tree | 3d1be0b1601952c519cb05cc8d426d4c902fcfd5 | |
| parent | 9dd2051ba6d9575f7a5a6a0746e1d0d1a1e5efe6 (diff) | |
| parent | ba3f5ec3884aafb6c9761ef8719b82d4345245fa (diff) | |
| download | Qt-afa0b42ba94de7533521ae705bdd1762fea9f50b.zip Qt-afa0b42ba94de7533521ae705bdd1762fea9f50b.tar.gz Qt-afa0b42ba94de7533521ae705bdd1762fea9f50b.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Symbian: fix tst_QMenuBar::task256322_highlight() regression
| -rw-r--r-- | src/gui/widgets/qmenubar.cpp | 2 |
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 |