summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarkku Luukkainen <markku.luukkainen@digia.com>2009-06-06 12:31:22 (GMT)
committerMarkku Luukkainen <markku.luukkainen@digia.com>2009-06-06 12:31:22 (GMT)
commit934ebcd3e3c1c568ac8371dbb1d96cd06385883d (patch)
treef43afb0149018a7e4ab957bc3bde7187ec4702e6 /src
parentd0432c7d7c06c83ccaa2266217e5b1823fa8dba6 (diff)
downloadQt-934ebcd3e3c1c568ac8371dbb1d96cd06385883d.zip
Qt-934ebcd3e3c1c568ac8371dbb1d96cd06385883d.tar.gz
Qt-934ebcd3e3c1c568ac8371dbb1d96cd06385883d.tar.bz2
Disabled context sensitive menu because it would cause compilation
failure. Context menu will be enabled again once the QAction SoftKeyRole implementation is in state where context menu can be properly supported
Diffstat (limited to 'src')
-rw-r--r--src/gui/widgets/qmenu_symbian.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/widgets/qmenu_symbian.cpp b/src/gui/widgets/qmenu_symbian.cpp
index f27e580..df95061 100644
--- a/src/gui/widgets/qmenu_symbian.cpp
+++ b/src/gui/widgets/qmenu_symbian.cpp
@@ -214,7 +214,7 @@ static void rebuildMenu()
QMenuBarPrivate *mb = 0;
QWidget *w = qApp->activeWindow();
QMainWindow *mainWindow = qobject_cast<QMainWindow*>(w);
- if ((mainWindow) && mainWindow->hasSoftKeyStack()) {
+ /* if ((mainWindow) && mainWindow->hasSoftKeyStack()) {
QSoftKeyStack* softKeyStack = mainWindow->softKeyStack();
if (!softKeyStack->isEmpty()) {
const QSoftkeySet& softKeyTop = softKeyStack->top();
@@ -231,7 +231,7 @@ static void rebuildMenu()
}
}
}
-
+*/
if (w) {
mb = menubars()->value(w);
qt_symbian_menu_static_cmd_id = QT_FIRST_MENU_ITEM;