diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-21 20:08:56 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-21 20:08:56 (GMT) |
| commit | af92d15b625d2042814323fcebfa41c5bbb6b09d (patch) | |
| tree | 13cf3dce4252c2b5ef166860e9a423d72f630da9 /src/gui/kernel/qkeymapper_win.cpp | |
| parent | 511c434b959be96c992e59f4a2748ac251d5c72a (diff) | |
| parent | 26eda5fa33e401a1803b42e6eacf0921ddc6a14e (diff) | |
| download | Qt-af92d15b625d2042814323fcebfa41c5bbb6b09d.zip Qt-af92d15b625d2042814323fcebfa41c5bbb6b09d.tar.gz Qt-af92d15b625d2042814323fcebfa41c5bbb6b09d.tar.bz2 | |
Merge branch '4.6'
Diffstat (limited to 'src/gui/kernel/qkeymapper_win.cpp')
| -rw-r--r-- | src/gui/kernel/qkeymapper_win.cpp | 4 |
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]; |