From f4a10959e579f6c8d77defa24107a5f6a02749b9 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@nokia.com>
Date: Tue, 20 Oct 2009 15:19:37 +0200
Subject: don't remap VK_RETURN on Windows mobile if not in keypad navigation
 mode

Reviewed-by: TrustMe
---
 src/gui/kernel/qkeymapper_win.cpp | 4 ++--
 1 file 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];
-- 
cgit v0.12