diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-14 10:08:51 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-14 11:06:37 +0200 |
| commit | bdeb81b73122d6962ca4796c573dcbc636ccb195 (patch) | |
| tree | 946530bfe0f7bd506ea26633f8374fde5180c6cb /src/core/web_event_factory.cpp | |
| parent | 529623a9f3590ac0ac3baf3ccece793c0ce7f825 (diff) | |
| parent | c7d46325e635d1fb4482b53dce866e2c55026a7e (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I0860a46b981c1f711bec45d7a495bcec2a80ee1f
Diffstat (limited to 'src/core/web_event_factory.cpp')
| -rw-r--r-- | src/core/web_event_factory.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/web_event_factory.cpp b/src/core/web_event_factory.cpp index e6ac63c0d..18f8d393f 100644 --- a/src/core/web_event_factory.cpp +++ b/src/core/web_event_factory.cpp @@ -144,7 +144,6 @@ static int windowsKeyCodeForKeyEvent(unsigned int keycode, bool isKeypad) return VK_SHIFT; // (10) SHIFT key case Qt::Key_Control: return VK_CONTROL; // (11) CTRL key - case Qt::Key_Menu: case Qt::Key_Alt: return VK_MENU; // (12) ALT key default: @@ -167,7 +166,6 @@ static int windowsKeyCodeForKeyEvent(unsigned int keycode, bool isKeypad) return VK_SHIFT; // (10) SHIFT key case Qt::Key_Control: return VK_CONTROL; // (11) CTRL key - case Qt::Key_Menu: case Qt::Key_Alt: return VK_MENU; // (12) ALT key @@ -357,7 +355,8 @@ static int windowsKeyCodeForKeyEvent(unsigned int keycode, bool isKeypad) return VK_LWIN; // (5B) Left Windows key (Microsoft Natural keyboard) // case Qt::Key_Meta_R: FIXME: What to do here? // return VK_RWIN; // (5C) Right Windows key (Natural keyboard) - // VK_APPS (5D) Applications key (Natural keyboard) + case Qt::Key_Menu: // (5D) Applications key (Natural keyboard) + return VK_APPS; // VK_SLEEP (5F) Computer Sleep key // VK_SEPARATOR (6C) Separator key // VK_SUBTRACT (6D) Subtract key |