summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-11-25 12:47:33 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2009-11-25 12:58:50 (GMT)
commitb461da1040c32d6690870290d6716a3b5cb7e9e9 (patch)
tree9a3e6edaec3d94216d595e24ddef76ac99992533
parentab6fd6f9755ecbd556f1a7824ca0c3fa88148b87 (diff)
downloadQt-b461da1040c32d6690870290d6716a3b5cb7e9e9.zip
Qt-b461da1040c32d6690870290d6716a3b5cb7e9e9.tar.gz
Qt-b461da1040c32d6690870290d6716a3b5cb7e9e9.tar.bz2
Fixed context menu not to have "Options" action.
When calling QMainWindow::setMenuBar(), menuBarAction ("Options") gets added to widget actions list. This actions will be shown in widget context menu if visible. That's why we set the action invisible. Visibility property does not have impact to softkey contruction, i.e. also invisble softkeys are added. Task-number: QTBUG-6220 Reviewed-by: Jason Barron
-rw-r--r--src/gui/widgets/qmainwindow.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/widgets/qmainwindow.cpp b/src/gui/widgets/qmainwindow.cpp
index 501e62f..557acfb 100644
--- a/src/gui/widgets/qmainwindow.cpp
+++ b/src/gui/widgets/qmainwindow.cpp
@@ -120,6 +120,7 @@ void QMainWindowPrivate::init()
#ifdef QT_SOFTKEYS_ENABLED
menuBarAction = QSoftKeyManager::createAction(QSoftKeyManager::MenuSoftKey, q);
menuBarAction->setObjectName(QLatin1String("_q_menuSoftKeyAction"));
+ menuBarAction->setVisible(false);
#endif
}