summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@nokia.com>2009-10-20 13:19:37 (GMT)
committerJoerg Bornemann <joerg.bornemann@nokia.com>2009-10-21 09:47:18 (GMT)
commitf4a10959e579f6c8d77defa24107a5f6a02749b9 (patch)
tree11ed5af7e4cc604db3773464bb0bbe9926d7e574
parentee8769ddaff1b69bfd1a959c3c58a96416736890 (diff)
downloadQt-f4a10959e579f6c8d77defa24107a5f6a02749b9.zip
Qt-f4a10959e579f6c8d77defa24107a5f6a02749b9.tar.gz
Qt-f4a10959e579f6c8d77defa24107a5f6a02749b9.tar.bz2
don't remap VK_RETURN on Windows mobile if not in keypad navigation mode
Reviewed-by: TrustMe
-rw-r--r--src/gui/kernel/qkeymapper_win.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qkeymapper_win.cpp b/src/gui/kernel/qkeymapper_win.cpp
index be207df..f95efa2 100644
--- a/src/gui/kernel/qkeymapper_win.cpp
+++ b/src/gui/kernel/qkeymapper_win.cpp
@@ -438,10 +438,10 @@ static const Qt::KeyboardModifiers ModsTbl[] = {
*/
inline int winceKeyBend(int keyCode)
{
-#ifdef Q_OS_WINCE_WM
+#if defined(Q_OS_WINCE_WM) && defined(QT_KEYPAD_NAVIGATION)
// remap return or action key to select key for windows mobile.
// will be changed to a table remapping function in the next version (4.6/7).
- if (keyCode == 13)
+ if (keyCode == VK_RETURN && QApplication::keypadNavigationEnabled())
return Qt::Key_Select;
else
return KeyTbl[keyCode];