diff options
| author | Adam Wasila <ext-adam.2.wasila@nokia.com> | 2010-03-29 14:55:01 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2010-04-16 11:12:54 (GMT) |
| commit | 728a4b8a6b44bc3dd8db0e49b823ea12b210644f (patch) | |
| tree | 769b5789ded3c14a4d8c709dae976361080d3e2f | |
| parent | 048e0ba0be9c6aec608706e15eda040f7219c420 (diff) | |
| download | Qt-728a4b8a6b44bc3dd8db0e49b823ea12b210644f.zip Qt-728a4b8a6b44bc3dd8db0e49b823ea12b210644f.tar.gz Qt-728a4b8a6b44bc3dd8db0e49b823ea12b210644f.tar.bz2 | |
adding new entries to qt::key enum
| -rw-r--r-- | src/corelib/global/qnamespace.h | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qkeymapper_s60.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 09c000b..08674d2 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -1092,6 +1092,8 @@ public: Key_Call = 0x01100004, Key_Hangup = 0x01100005, Key_Flip = 0x01100006, + Key_Camera = 0x01100007, + Key_CameraFocus = 0x01100008, Key_unknown = 0x01ffffff }; diff --git a/src/gui/kernel/qkeymapper_s60.cpp b/src/gui/kernel/qkeymapper_s60.cpp index fd263ef..d019c0f 100644 --- a/src/gui/kernel/qkeymapper_s60.cpp +++ b/src/gui/kernel/qkeymapper_s60.cpp @@ -144,7 +144,7 @@ static const KeyMapping keyMapping[] = { {EKeyDevice0, EStdKeyDevice0, Key_Context1}, // Found by manual testing. {EKeyDevice1, EStdKeyDevice1, Key_Context2}, // Found by manual testing. {EKeyDevice3, EStdKeyDevice3, Key_Select}, -// {EKeyDevice7, EStdKeyDevice7, Key_Camera}, //not supported by qt yet + {EKeyDevice7, EStdKeyDevice7, Key_Camera}, {EKeyApplication0, EStdKeyApplication0, Key_Menu}, // Found by manual testing. {EKeyApplication1, EStdKeyApplication1, Key_Launch1}, // Found by manual testing. {EKeyApplication2, EStdKeyApplication2, Key_MediaPlay}, // Found by manual testing. @@ -161,7 +161,7 @@ static const KeyMapping keyMapping[] = { {EKeyApplicationD, EStdKeyApplicationD, Key_LaunchD}, {EKeyApplicationE, EStdKeyApplicationE, Key_LaunchE}, {EKeyApplicationF, EStdKeyApplicationF, Key_LaunchF}, -// {EKeyApplication19, EStdKeyApplication19, Key_CameraFocus}, //not supported by qt yet + {EKeyApplication19, EStdKeyApplication19, Key_CameraFocus}, {EKeyYes, EStdKeyYes, Key_Yes}, {EKeyNo, EStdKeyNo, Key_No}, {TKeyCode(0), TStdScanCode(0), Qt::Key(0)} |