diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-16 15:08:49 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-16 15:08:49 (GMT) |
| commit | 5d20a068763590ea02fb35a533241cc784bc6fd5 (patch) | |
| tree | 4f2d931a33aa2bf2be6559a86a372a2b59c30856 /src/gui/widgets | |
| parent | 9312e24343468e87a293bc2e24a43264d23e5d13 (diff) | |
| parent | afa0b42ba94de7533521ae705bdd1762fea9f50b (diff) | |
| download | Qt-5d20a068763590ea02fb35a533241cc784bc6fd5.zip Qt-5d20a068763590ea02fb35a533241cc784bc6fd5.tar.gz Qt-5d20a068763590ea02fb35a533241cc784bc6fd5.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Symbian: fix tst_QMenuBar::task256322_highlight() regression
Diffstat (limited to 'src/gui/widgets')
| -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 |