summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets/qmenubar.cpp
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-11-24 13:57:31 (GMT)
committeraxis <qt-info@nokia.com>2009-11-24 13:57:31 (GMT)
commit89f81333b1f499d829cc5eeac63f790840c6f574 (patch)
tree79bdf0e62e51e6fbe6255082f4daf3afbbd5fff6 /src/gui/widgets/qmenubar.cpp
parentbd2a3643c9796cc938c40c4d340d8cc5346992f4 (diff)
parent4817debee23a72f44eedbb8f33b6b611b5161174 (diff)
downloadQt-89f81333b1f499d829cc5eeac63f790840c6f574.zip
Qt-89f81333b1f499d829cc5eeac63f790840c6f574.tar.gz
Qt-89f81333b1f499d829cc5eeac63f790840c6f574.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-staging2
Diffstat (limited to 'src/gui/widgets/qmenubar.cpp')
-rw-r--r--src/gui/widgets/qmenubar.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/widgets/qmenubar.cpp b/src/gui/widgets/qmenubar.cpp
index 40cfe1a..599f15b 100644
--- a/src/gui/widgets/qmenubar.cpp
+++ b/src/gui/widgets/qmenubar.cpp
@@ -736,6 +736,9 @@ void QMenuBarPrivate::init()
if(wce_menubar)
q->hide();
}
+ else {
+ QApplication::setAttribute(Qt::AA_DontUseNativeMenuBar, true);
+ }
#endif
#ifdef Q_WS_S60
symbianCreateMenuBar(q->parentWidget());