summaryrefslogtreecommitdiffstats
path: root/src/gui/styles/qwindowsmobilestyle.cpp
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2009-04-17 07:23:47 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2009-04-17 07:23:47 (GMT)
commit58f8796ae4d9dcb9e741d2a07c87e6b82a2a4d9b (patch)
tree5f265a6f87cabef61dd763aab3d76e200d8d67a3 /src/gui/styles/qwindowsmobilestyle.cpp
parentac7484e36bfab69473278d7268cf37f7c69abfd2 (diff)
parentd43d33eb3121519d0025ad433d5c186365c47ef6 (diff)
downloadQt-58f8796ae4d9dcb9e741d2a07c87e6b82a2a4d9b.zip
Qt-58f8796ae4d9dcb9e741d2a07c87e6b82a2a4d9b.tar.gz
Qt-58f8796ae4d9dcb9e741d2a07c87e6b82a2a4d9b.tar.bz2
Merge branch 'qt/main'
Conflicts: src/opengl/opengl.pro
Diffstat (limited to 'src/gui/styles/qwindowsmobilestyle.cpp')
-rw-r--r--src/gui/styles/qwindowsmobilestyle.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/styles/qwindowsmobilestyle.cpp b/src/gui/styles/qwindowsmobilestyle.cpp
index c52c700..1c03b9e 100644
--- a/src/gui/styles/qwindowsmobilestyle.cpp
+++ b/src/gui/styles/qwindowsmobilestyle.cpp
@@ -3401,6 +3401,9 @@ int QWindowsMobileStyle::styleHint(StyleHint hint, const QStyleOption *opt, cons
case SH_ScrollBar_ContextMenu:
ret = false;
break;
+ case SH_MenuBar_AltKeyNavigation:
+ ret = false;
+ break;
default:
ret = QWindowsStyle::styleHint(hint, opt, widget, returnData);
break;