Fix CapsLock handling in EvdevKeyboard plugin

CapsLock was incorrectly handled in EvdevKeyboard, which led non-letter
keys to be masked with Qt::ShiftModifier. The default builtin keymap
is modified to have IsLetter flags for correct keys.

Task-number: QTBUG-32560

Change-Id: I561bbad7bcffe1f4c4bbed7bf72106b689e57fe0
Reviewed-by: Andy Nichols <andy.nichols@digia.com>

2 files changed, 425 insertions, 420 deletions

diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h b/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h
index 2aa8248c32..22d1622516 100644
--- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h
+++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h
@@ -89,166 +89,166 @@ const QEvdevKeyboardMap::Mapping QEvdevKeyboardHandler::s_keymap_default[] = {
     {  14, 0xffff, 0x01000003, 0x00, 0x00, 0x0000 },
     {  14, 0xffff, 0x01000000, 0x0c, 0x08, 0x0300 },
     {  15, 0xffff, 0x01000001, 0x00, 0x00, 0x0000 },
-    {  16, 0x0071, 0x00000051, 0x00, 0x00, 0x0000 },
-    {  16, 0x0051, 0x00000051, 0x01, 0x00, 0x0000 },
-    {  16, 0x0071, 0x00000051, 0x02, 0x00, 0x0000 },
-    {  16, 0x0051, 0x00000051, 0x03, 0x00, 0x0000 },
-    {  16, 0x0071, 0x04000051, 0x04, 0x00, 0x0000 },
-    {  16, 0x0071, 0x04000051, 0x05, 0x00, 0x0000 },
-    {  16, 0x0071, 0x04000051, 0x06, 0x00, 0x0000 },
-    {  16, 0x0071, 0x04000051, 0x07, 0x00, 0x0000 },
-    {  16, 0x0071, 0x08000051, 0x08, 0x00, 0x0000 },
-    {  16, 0x0071, 0x08000051, 0x09, 0x00, 0x0000 },
-    {  16, 0x0071, 0x08000051, 0x0a, 0x00, 0x0000 },
-    {  16, 0x0071, 0x08000051, 0x0b, 0x00, 0x0000 },
-    {  16, 0x0071, 0x0c000051, 0x0c, 0x00, 0x0000 },
-    {  16, 0x0071, 0x0c000051, 0x0d, 0x00, 0x0000 },
-    {  16, 0x0071, 0x0c000051, 0x0e, 0x00, 0x0000 },
-    {  16, 0x0071, 0x0c000051, 0x0f, 0x00, 0x0000 },
-    {  17, 0x0077, 0x00000057, 0x00, 0x00, 0x0000 },
-    {  17, 0x0057, 0x00000057, 0x01, 0x00, 0x0000 },
-    {  17, 0x0077, 0x00000057, 0x02, 0x00, 0x0000 },
-    {  17, 0x0057, 0x00000057, 0x03, 0x00, 0x0000 },
-    {  17, 0x0077, 0x04000057, 0x04, 0x00, 0x0000 },
-    {  17, 0x0077, 0x04000057, 0x05, 0x00, 0x0000 },
-    {  17, 0x0077, 0x04000057, 0x06, 0x00, 0x0000 },
-    {  17, 0x0077, 0x04000057, 0x07, 0x00, 0x0000 },
-    {  17, 0x0077, 0x08000057, 0x08, 0x00, 0x0000 },
-    {  17, 0x0077, 0x08000057, 0x09, 0x00, 0x0000 },
-    {  17, 0x0077, 0x08000057, 0x0a, 0x00, 0x0000 },
-    {  17, 0x0077, 0x08000057, 0x0b, 0x00, 0x0000 },
-    {  17, 0x0077, 0x0c000057, 0x0c, 0x00, 0x0000 },
-    {  17, 0x0077, 0x0c000057, 0x0d, 0x00, 0x0000 },
-    {  17, 0x0077, 0x0c000057, 0x0e, 0x00, 0x0000 },
-    {  17, 0x0077, 0x0c000057, 0x0f, 0x00, 0x0000 },
-    {  18, 0x0065, 0x00000045, 0x00, 0x00, 0x0000 },
-    {  18, 0x0045, 0x00000045, 0x01, 0x00, 0x0000 },
-    {  18, 0x0065, 0x00000045, 0x02, 0x00, 0x0000 },
-    {  18, 0x0045, 0x00000045, 0x03, 0x00, 0x0000 },
-    {  18, 0x0065, 0x04000045, 0x04, 0x00, 0x0000 },
-    {  18, 0x0065, 0x04000045, 0x05, 0x00, 0x0000 },
-    {  18, 0x0065, 0x04000045, 0x06, 0x00, 0x0000 },
-    {  18, 0x0065, 0x04000045, 0x07, 0x00, 0x0000 },
-    {  18, 0x0065, 0x08000045, 0x08, 0x00, 0x0000 },
-    {  18, 0x0065, 0x08000045, 0x09, 0x00, 0x0000 },
-    {  18, 0x0065, 0x08000045, 0x0a, 0x00, 0x0000 },
-    {  18, 0x0065, 0x08000045, 0x0b, 0x00, 0x0000 },
-    {  18, 0x0065, 0x0c000045, 0x0c, 0x00, 0x0000 },
-    {  18, 0x0065, 0x0c000045, 0x0d, 0x00, 0x0000 },
-    {  18, 0x0065, 0x0c000045, 0x0e, 0x00, 0x0000 },
-    {  18, 0x0065, 0x0c000045, 0x0f, 0x00, 0x0000 },
-    {  19, 0x0072, 0x00000052, 0x00, 0x00, 0x0000 },
-    {  19, 0x0052, 0x00000052, 0x01, 0x00, 0x0000 },
-    {  19, 0x0072, 0x00000052, 0x02, 0x00, 0x0000 },
-    {  19, 0x0052, 0x00000052, 0x03, 0x00, 0x0000 },
-    {  19, 0x0072, 0x04000052, 0x04, 0x00, 0x0000 },
-    {  19, 0x0072, 0x04000052, 0x05, 0x00, 0x0000 },
-    {  19, 0x0072, 0x04000052, 0x06, 0x00, 0x0000 },
-    {  19, 0x0072, 0x04000052, 0x07, 0x00, 0x0000 },
-    {  19, 0x0072, 0x08000052, 0x08, 0x00, 0x0000 },
-    {  19, 0x0072, 0x08000052, 0x09, 0x00, 0x0000 },
-    {  19, 0x0072, 0x08000052, 0x0a, 0x00, 0x0000 },
-    {  19, 0x0072, 0x08000052, 0x0b, 0x00, 0x0000 },
-    {  19, 0x0072, 0x0c000052, 0x0c, 0x00, 0x0000 },
-    {  19, 0x0072, 0x0c000052, 0x0d, 0x00, 0x0000 },
-    {  19, 0x0072, 0x0c000052, 0x0e, 0x00, 0x0000 },
-    {  19, 0x0072, 0x0c000052, 0x0f, 0x00, 0x0000 },
-    {  20, 0x0074, 0x00000054, 0x00, 0x00, 0x0000 },
-    {  20, 0x0054, 0x00000054, 0x01, 0x00, 0x0000 },
-    {  20, 0x0074, 0x00000054, 0x02, 0x00, 0x0000 },
-    {  20, 0x0054, 0x00000054, 0x03, 0x00, 0x0000 },
-    {  20, 0x0074, 0x04000054, 0x04, 0x00, 0x0000 },
-    {  20, 0x0074, 0x04000054, 0x05, 0x00, 0x0000 },
-    {  20, 0x0074, 0x04000054, 0x06, 0x00, 0x0000 },
-    {  20, 0x0074, 0x04000054, 0x07, 0x00, 0x0000 },
-    {  20, 0x0074, 0x08000054, 0x08, 0x00, 0x0000 },
-    {  20, 0x0074, 0x08000054, 0x09, 0x00, 0x0000 },
-    {  20, 0x0074, 0x08000054, 0x0a, 0x00, 0x0000 },
-    {  20, 0x0074, 0x08000054, 0x0b, 0x00, 0x0000 },
-    {  20, 0x0074, 0x0c000054, 0x0c, 0x00, 0x0000 },
-    {  20, 0x0074, 0x0c000054, 0x0d, 0x00, 0x0000 },
-    {  20, 0x0074, 0x0c000054, 0x0e, 0x00, 0x0000 },
-    {  20, 0x0074, 0x0c000054, 0x0f, 0x00, 0x0000 },
-    {  21, 0x0079, 0x00000059, 0x00, 0x00, 0x0000 },
-    {  21, 0x0059, 0x00000059, 0x01, 0x00, 0x0000 },
-    {  21, 0x0079, 0x00000059, 0x02, 0x00, 0x0000 },
-    {  21, 0x0059, 0x00000059, 0x03, 0x00, 0x0000 },
-    {  21, 0x0079, 0x04000059, 0x04, 0x00, 0x0000 },
-    {  21, 0x0079, 0x04000059, 0x05, 0x00, 0x0000 },
-    {  21, 0x0079, 0x04000059, 0x06, 0x00, 0x0000 },
-    {  21, 0x0079, 0x04000059, 0x07, 0x00, 0x0000 },
-    {  21, 0x0079, 0x08000059, 0x08, 0x00, 0x0000 },
-    {  21, 0x0079, 0x08000059, 0x09, 0x00, 0x0000 },
-    {  21, 0x0079, 0x08000059, 0x0a, 0x00, 0x0000 },
-    {  21, 0x0079, 0x08000059, 0x0b, 0x00, 0x0000 },
-    {  21, 0x0079, 0x0c000059, 0x0c, 0x00, 0x0000 },
-    {  21, 0x0079, 0x0c000059, 0x0d, 0x00, 0x0000 },
-    {  21, 0x0079, 0x0c000059, 0x0e, 0x00, 0x0000 },
-    {  21, 0x0079, 0x0c000059, 0x0f, 0x00, 0x0000 },
-    {  22, 0x0075, 0x00000055, 0x00, 0x00, 0x0000 },
-    {  22, 0x0055, 0x00000055, 0x01, 0x00, 0x0000 },
-    {  22, 0x0075, 0x00000055, 0x02, 0x00, 0x0000 },
-    {  22, 0x0055, 0x00000055, 0x03, 0x00, 0x0000 },
-    {  22, 0x0075, 0x04000055, 0x04, 0x00, 0x0000 },
-    {  22, 0x0075, 0x04000055, 0x05, 0x00, 0x0000 },
-    {  22, 0x0075, 0x04000055, 0x06, 0x00, 0x0000 },
-    {  22, 0x0075, 0x04000055, 0x07, 0x00, 0x0000 },
-    {  22, 0x0075, 0x08000055, 0x08, 0x00, 0x0000 },
-    {  22, 0x0075, 0x08000055, 0x09, 0x00, 0x0000 },
-    {  22, 0x0075, 0x08000055, 0x0a, 0x00, 0x0000 },
-    {  22, 0x0075, 0x08000055, 0x0b, 0x00, 0x0000 },
-    {  22, 0x0075, 0x0c000055, 0x0c, 0x00, 0x0000 },
-    {  22, 0x0075, 0x0c000055, 0x0d, 0x00, 0x0000 },
-    {  22, 0x0075, 0x0c000055, 0x0e, 0x00, 0x0000 },
-    {  22, 0x0075, 0x0c000055, 0x0f, 0x00, 0x0000 },
-    {  23, 0x0069, 0x00000049, 0x00, 0x00, 0x0000 },
-    {  23, 0x0049, 0x00000049, 0x01, 0x00, 0x0000 },
-    {  23, 0x0069, 0x00000049, 0x02, 0x00, 0x0000 },
-    {  23, 0x0049, 0x00000049, 0x03, 0x00, 0x0000 },
-    {  23, 0x0069, 0x04000049, 0x04, 0x00, 0x0000 },
-    {  23, 0x0069, 0x04000049, 0x05, 0x00, 0x0000 },
-    {  23, 0x0069, 0x04000049, 0x06, 0x00, 0x0000 },
-    {  23, 0x0069, 0x04000049, 0x07, 0x00, 0x0000 },
-    {  23, 0x0069, 0x08000049, 0x08, 0x00, 0x0000 },
-    {  23, 0x0069, 0x08000049, 0x09, 0x00, 0x0000 },
-    {  23, 0x0069, 0x08000049, 0x0a, 0x00, 0x0000 },
-    {  23, 0x0069, 0x08000049, 0x0b, 0x00, 0x0000 },
-    {  23, 0x0069, 0x0c000049, 0x0c, 0x00, 0x0000 },
-    {  23, 0x0069, 0x0c000049, 0x0d, 0x00, 0x0000 },
-    {  23, 0x0069, 0x0c000049, 0x0e, 0x00, 0x0000 },
-    {  23, 0x0069, 0x0c000049, 0x0f, 0x00, 0x0000 },
-    {  24, 0x006f, 0x0000004f, 0x00, 0x00, 0x0000 },
-    {  24, 0x004f, 0x0000004f, 0x01, 0x00, 0x0000 },
-    {  24, 0x006f, 0x0000004f, 0x02, 0x00, 0x0000 },
-    {  24, 0x004f, 0x0000004f, 0x03, 0x00, 0x0000 },
-    {  24, 0x006f, 0x0400004f, 0x04, 0x00, 0x0000 },
-    {  24, 0x006f, 0x0400004f, 0x05, 0x00, 0x0000 },
-    {  24, 0x006f, 0x0400004f, 0x06, 0x00, 0x0000 },
-    {  24, 0x006f, 0x0400004f, 0x07, 0x00, 0x0000 },
-    {  24, 0x006f, 0x0800004f, 0x08, 0x00, 0x0000 },
-    {  24, 0x006f, 0x0800004f, 0x09, 0x00, 0x0000 },
-    {  24, 0x006f, 0x0800004f, 0x0a, 0x00, 0x0000 },
-    {  24, 0x006f, 0x0800004f, 0x0b, 0x00, 0x0000 },
-    {  24, 0x006f, 0x0c00004f, 0x0c, 0x00, 0x0000 },
-    {  24, 0x006f, 0x0c00004f, 0x0d, 0x00, 0x0000 },
-    {  24, 0x006f, 0x0c00004f, 0x0e, 0x00, 0x0000 },
-    {  24, 0x006f, 0x0c00004f, 0x0f, 0x00, 0x0000 },
-    {  25, 0x0070, 0x00000050, 0x00, 0x00, 0x0000 },
-    {  25, 0x0050, 0x00000050, 0x01, 0x00, 0x0000 },
-    {  25, 0x0070, 0x00000050, 0x02, 0x00, 0x0000 },
-    {  25, 0x0050, 0x00000050, 0x03, 0x00, 0x0000 },
-    {  25, 0x0070, 0x04000050, 0x04, 0x00, 0x0000 },
-    {  25, 0x0070, 0x04000050, 0x05, 0x00, 0x0000 },
-    {  25, 0x0070, 0x04000050, 0x06, 0x00, 0x0000 },
-    {  25, 0x0070, 0x04000050, 0x07, 0x00, 0x0000 },
-    {  25, 0x0070, 0x08000050, 0x08, 0x00, 0x0000 },
-    {  25, 0x0070, 0x08000050, 0x09, 0x00, 0x0000 },
-    {  25, 0x0070, 0x08000050, 0x0a, 0x00, 0x0000 },
-    {  25, 0x0070, 0x08000050, 0x0b, 0x00, 0x0000 },
-    {  25, 0x0070, 0x0c000050, 0x0c, 0x00, 0x0000 },
-    {  25, 0x0070, 0x0c000050, 0x0d, 0x00, 0x0000 },
-    {  25, 0x0070, 0x0c000050, 0x0e, 0x00, 0x0000 },
-    {  25, 0x0070, 0x0c000050, 0x0f, 0x00, 0x0000 },
+    {  16, 0x0071, 0x00000051, 0x00, 0x02, 0x0000 },
+    {  16, 0x0051, 0x00000051, 0x01, 0x02, 0x0000 },
+    {  16, 0x0071, 0x00000051, 0x02, 0x02, 0x0000 },
+    {  16, 0x0051, 0x00000051, 0x03, 0x02, 0x0000 },
+    {  16, 0x0071, 0x04000051, 0x04, 0x02, 0x0000 },
+    {  16, 0x0071, 0x04000051, 0x05, 0x02, 0x0000 },
+    {  16, 0x0071, 0x04000051, 0x06, 0x02, 0x0000 },
+    {  16, 0x0071, 0x04000051, 0x07, 0x02, 0x0000 },
+    {  16, 0x0071, 0x08000051, 0x08, 0x02, 0x0000 },
+    {  16, 0x0071, 0x08000051, 0x09, 0x02, 0x0000 },
+    {  16, 0x0071, 0x08000051, 0x0a, 0x02, 0x0000 },
+    {  16, 0x0071, 0x08000051, 0x0b, 0x02, 0x0000 },
+    {  16, 0x0071, 0x0c000051, 0x0c, 0x02, 0x0000 },
+    {  16, 0x0071, 0x0c000051, 0x0d, 0x02, 0x0000 },
+    {  16, 0x0071, 0x0c000051, 0x0e, 0x02, 0x0000 },
+    {  16, 0x0071, 0x0c000051, 0x0f, 0x02, 0x0000 },
+    {  17, 0x0077, 0x00000057, 0x00, 0x02, 0x0000 },
+    {  17, 0x0057, 0x00000057, 0x01, 0x02, 0x0000 },
+    {  17, 0x0077, 0x00000057, 0x02, 0x02, 0x0000 },
+    {  17, 0x0057, 0x00000057, 0x03, 0x02, 0x0000 },
+    {  17, 0x0077, 0x04000057, 0x04, 0x02, 0x0000 },
+    {  17, 0x0077, 0x04000057, 0x05, 0x02, 0x0000 },
+    {  17, 0x0077, 0x04000057, 0x06, 0x02, 0x0000 },
+    {  17, 0x0077, 0x04000057, 0x07, 0x02, 0x0000 },
+    {  17, 0x0077, 0x08000057, 0x08, 0x02, 0x0000 },
+    {  17, 0x0077, 0x08000057, 0x09, 0x02, 0x0000 },
+    {  17, 0x0077, 0x08000057, 0x0a, 0x02, 0x0000 },
+    {  17, 0x0077, 0x08000057, 0x0b, 0x02, 0x0000 },
+    {  17, 0x0077, 0x0c000057, 0x0c, 0x02, 0x0000 },
+    {  17, 0x0077, 0x0c000057, 0x0d, 0x02, 0x0000 },
+    {  17, 0x0077, 0x0c000057, 0x0e, 0x02, 0x0000 },
+    {  17, 0x0077, 0x0c000057, 0x0f, 0x02, 0x0000 },
+    {  18, 0x0065, 0x00000045, 0x00, 0x02, 0x0000 },
+    {  18, 0x0045, 0x00000045, 0x01, 0x02, 0x0000 },
+    {  18, 0x0065, 0x00000045, 0x02, 0x02, 0x0000 },
+    {  18, 0x0045, 0x00000045, 0x03, 0x02, 0x0000 },
+    {  18, 0x0065, 0x04000045, 0x04, 0x02, 0x0000 },
+    {  18, 0x0065, 0x04000045, 0x05, 0x02, 0x0000 },
+    {  18, 0x0065, 0x04000045, 0x06, 0x02, 0x0000 },
+    {  18, 0x0065, 0x04000045, 0x07, 0x02, 0x0000 },
+    {  18, 0x0065, 0x08000045, 0x08, 0x02, 0x0000 },
+    {  18, 0x0065, 0x08000045, 0x09, 0x02, 0x0000 },
+    {  18, 0x0065, 0x08000045, 0x0a, 0x02, 0x0000 },
+    {  18, 0x0065, 0x08000045, 0x0b, 0x02, 0x0000 },
+    {  18, 0x0065, 0x0c000045, 0x0c, 0x02, 0x0000 },
+    {  18, 0x0065, 0x0c000045, 0x0d, 0x02, 0x0000 },
+    {  18, 0x0065, 0x0c000045, 0x0e, 0x02, 0x0000 },
+    {  18, 0x0065, 0x0c000045, 0x0f, 0x02, 0x0000 },
+    {  19, 0x0072, 0x00000052, 0x00, 0x02, 0x0000 },
+    {  19, 0x0052, 0x00000052, 0x01, 0x02, 0x0000 },
+    {  19, 0x0072, 0x00000052, 0x02, 0x02, 0x0000 },
+    {  19, 0x0052, 0x00000052, 0x03, 0x02, 0x0000 },
+    {  19, 0x0072, 0x04000052, 0x04, 0x02, 0x0000 },
+    {  19, 0x0072, 0x04000052, 0x05, 0x02, 0x0000 },
+    {  19, 0x0072, 0x04000052, 0x06, 0x02, 0x0000 },
+    {  19, 0x0072, 0x04000052, 0x07, 0x02, 0x0000 },
+    {  19, 0x0072, 0x08000052, 0x08, 0x02, 0x0000 },
+    {  19, 0x0072, 0x08000052, 0x09, 0x02, 0x0000 },
+    {  19, 0x0072, 0x08000052, 0x0a, 0x02, 0x0000 },
+    {  19, 0x0072, 0x08000052, 0x0b, 0x02, 0x0000 },
+    {  19, 0x0072, 0x0c000052, 0x0c, 0x02, 0x0000 },
+    {  19, 0x0072, 0x0c000052, 0x0d, 0x02, 0x0000 },
+    {  19, 0x0072, 0x0c000052, 0x0e, 0x02, 0x0000 },
+    {  19, 0x0072, 0x0c000052, 0x0f, 0x02, 0x0000 },
+    {  20, 0x0074, 0x00000054, 0x00, 0x02, 0x0000 },
+    {  20, 0x0054, 0x00000054, 0x01, 0x02, 0x0000 },
+    {  20, 0x0074, 0x00000054, 0x02, 0x02, 0x0000 },
+    {  20, 0x0054, 0x00000054, 0x03, 0x02, 0x0000 },
+    {  20, 0x0074, 0x04000054, 0x04, 0x02, 0x0000 },
+    {  20, 0x0074, 0x04000054, 0x05, 0x02, 0x0000 },
+    {  20, 0x0074, 0x04000054, 0x06, 0x02, 0x0000 },
+    {  20, 0x0074, 0x04000054, 0x07, 0x02, 0x0000 },
+    {  20, 0x0074, 0x08000054, 0x08, 0x02, 0x0000 },
+    {  20, 0x0074, 0x08000054, 0x09, 0x02, 0x0000 },
+    {  20, 0x0074, 0x08000054, 0x0a, 0x02, 0x0000 },
+    {  20, 0x0074, 0x08000054, 0x0b, 0x02, 0x0000 },
+    {  20, 0x0074, 0x0c000054, 0x0c, 0x02, 0x0000 },
+    {  20, 0x0074, 0x0c000054, 0x0d, 0x02, 0x0000 },
+    {  20, 0x0074, 0x0c000054, 0x0e, 0x02, 0x0000 },
+    {  20, 0x0074, 0x0c000054, 0x0f, 0x02, 0x0000 },
+    {  21, 0x0079, 0x00000059, 0x00, 0x02, 0x0000 },
+    {  21, 0x0059, 0x00000059, 0x01, 0x02, 0x0000 },
+    {  21, 0x0079, 0x00000059, 0x02, 0x02, 0x0000 },
+    {  21, 0x0059, 0x00000059, 0x03, 0x02, 0x0000 },
+    {  21, 0x0079, 0x04000059, 0x04, 0x02, 0x0000 },
+    {  21, 0x0079, 0x04000059, 0x05, 0x02, 0x0000 },
+    {  21, 0x0079, 0x04000059, 0x06, 0x02, 0x0000 },
+    {  21, 0x0079, 0x04000059, 0x07, 0x02, 0x0000 },
+    {  21, 0x0079, 0x08000059, 0x08, 0x02, 0x0000 },
+    {  21, 0x0079, 0x08000059, 0x09, 0x02, 0x0000 },
+    {  21, 0x0079, 0x08000059, 0x0a, 0x02, 0x0000 },
+    {  21, 0x0079, 0x08000059, 0x0b, 0x02, 0x0000 },
+    {  21, 0x0079, 0x0c000059, 0x0c, 0x02, 0x0000 },
+    {  21, 0x0079, 0x0c000059, 0x0d, 0x02, 0x0000 },
+    {  21, 0x0079, 0x0c000059, 0x0e, 0x02, 0x0000 },
+    {  21, 0x0079, 0x0c000059, 0x0f, 0x02, 0x0000 },
+    {  22, 0x0075, 0x00000055, 0x00, 0x02, 0x0000 },
+    {  22, 0x0055, 0x00000055, 0x01, 0x02, 0x0000 },
+    {  22, 0x0075, 0x00000055, 0x02, 0x02, 0x0000 },
+    {  22, 0x0055, 0x00000055, 0x03, 0x02, 0x0000 },
+    {  22, 0x0075, 0x04000055, 0x04, 0x02, 0x0000 },
+    {  22, 0x0075, 0x04000055, 0x05, 0x02, 0x0000 },
+    {  22, 0x0075, 0x04000055, 0x06, 0x02, 0x0000 },
+    {  22, 0x0075, 0x04000055, 0x07, 0x02, 0x0000 },
+    {  22, 0x0075, 0x08000055, 0x08, 0x02, 0x0000 },
+    {  22, 0x0075, 0x08000055, 0x09, 0x02, 0x0000 },
+    {  22, 0x0075, 0x08000055, 0x0a, 0x02, 0x0000 },
+    {  22, 0x0075, 0x08000055, 0x0b, 0x02, 0x0000 },
+    {  22, 0x0075, 0x0c000055, 0x0c, 0x02, 0x0000 },
+    {  22, 0x0075, 0x0c000055, 0x0d, 0x02, 0x0000 },
+    {  22, 0x0075, 0x0c000055, 0x0e, 0x02, 0x0000 },
+    {  22, 0x0075, 0x0c000055, 0x0f, 0x02, 0x0000 },
+    {  23, 0x0069, 0x00000049, 0x00, 0x02, 0x0000 },
+    {  23, 0x0049, 0x00000049, 0x01, 0x02, 0x0000 },
+    {  23, 0x0069, 0x00000049, 0x02, 0x02, 0x0000 },
+    {  23, 0x0049, 0x00000049, 0x03, 0x02, 0x0000 },
+    {  23, 0x0069, 0x04000049, 0x04, 0x02, 0x0000 },
+    {  23, 0x0069, 0x04000049, 0x05, 0x02, 0x0000 },
+    {  23, 0x0069, 0x04000049, 0x06, 0x02, 0x0000 },
+    {  23, 0x0069, 0x04000049, 0x07, 0x02, 0x0000 },
+    {  23, 0x0069, 0x08000049, 0x08, 0x02, 0x0000 },
+    {  23, 0x0069, 0x08000049, 0x09, 0x02, 0x0000 },
+    {  23, 0x0069, 0x08000049, 0x0a, 0x02, 0x0000 },
+    {  23, 0x0069, 0x08000049, 0x0b, 0x02, 0x0000 },
+    {  23, 0x0069, 0x0c000049, 0x0c, 0x02, 0x0000 },
+    {  23, 0x0069, 0x0c000049, 0x0d, 0x02, 0x0000 },
+    {  23, 0x0069, 0x0c000049, 0x0e, 0x02, 0x0000 },
+    {  23, 0x0069, 0x0c000049, 0x0f, 0x02, 0x0000 },
+    {  24, 0x006f, 0x0000004f, 0x00, 0x02, 0x0000 },
+    {  24, 0x004f, 0x0000004f, 0x01, 0x02, 0x0000 },
+    {  24, 0x006f, 0x0000004f, 0x02, 0x02, 0x0000 },
+    {  24, 0x004f, 0x0000004f, 0x03, 0x02, 0x0000 },
+    {  24, 0x006f, 0x0400004f, 0x04, 0x02, 0x0000 },
+    {  24, 0x006f, 0x0400004f, 0x05, 0x02, 0x0000 },
+    {  24, 0x006f, 0x0400004f, 0x06, 0x02, 0x0000 },
+    {  24, 0x006f, 0x0400004f, 0x07, 0x02, 0x0000 },
+    {  24, 0x006f, 0x0800004f, 0x08, 0x02, 0x0000 },
+    {  24, 0x006f, 0x0800004f, 0x09, 0x02, 0x0000 },
+    {  24, 0x006f, 0x0800004f, 0x0a, 0x02, 0x0000 },
+    {  24, 0x006f, 0x0800004f, 0x0b, 0x02, 0x0000 },
+    {  24, 0x006f, 0x0c00004f, 0x0c, 0x02, 0x0000 },
+    {  24, 0x006f, 0x0c00004f, 0x0d, 0x02, 0x0000 },
+    {  24, 0x006f, 0x0c00004f, 0x0e, 0x02, 0x0000 },
+    {  24, 0x006f, 0x0c00004f, 0x0f, 0x02, 0x0000 },
+    {  25, 0x0070, 0x00000050, 0x00, 0x02, 0x0000 },
+    {  25, 0x0050, 0x00000050, 0x01, 0x02, 0x0000 },
+    {  25, 0x0070, 0x00000050, 0x02, 0x02, 0x0000 },
+    {  25, 0x0050, 0x00000050, 0x03, 0x02, 0x0000 },
+    {  25, 0x0070, 0x04000050, 0x04, 0x02, 0x0000 },
+    {  25, 0x0070, 0x04000050, 0x05, 0x02, 0x0000 },
+    {  25, 0x0070, 0x04000050, 0x06, 0x02, 0x0000 },
+    {  25, 0x0070, 0x04000050, 0x07, 0x02, 0x0000 },
+    {  25, 0x0070, 0x08000050, 0x08, 0x02, 0x0000 },
+    {  25, 0x0070, 0x08000050, 0x09, 0x02, 0x0000 },
+    {  25, 0x0070, 0x08000050, 0x0a, 0x02, 0x0000 },
+    {  25, 0x0070, 0x08000050, 0x0b, 0x02, 0x0000 },
+    {  25, 0x0070, 0x0c000050, 0x0c, 0x02, 0x0000 },
+    {  25, 0x0070, 0x0c000050, 0x0d, 0x02, 0x0000 },
+    {  25, 0x0070, 0x0c000050, 0x0e, 0x02, 0x0000 },
+    {  25, 0x0070, 0x0c000050, 0x0f, 0x02, 0x0000 },
     {  26, 0x005b, 0x0000005b, 0x00, 0x00, 0x0000 },
     {  26, 0x007b, 0x0000007b, 0x01, 0x00, 0x0000 },
     {  26, 0xffff, 0x01000000, 0x04, 0x00, 0x0000 },
@@ -259,150 +259,150 @@ const QEvdevKeyboardMap::Mapping QEvdevKeyboardHandler::s_keymap_default[] = {
     {  28, 0xffff, 0x01000004, 0x00, 0x00, 0x0000 },
     {  28, 0x006d, 0x0c00004d, 0x08, 0x00, 0x0000 },
     {  29, 0xffff, 0x01000021, 0x00, 0x04, 0x0004 },
-    {  30, 0x0061, 0x00000041, 0x00, 0x00, 0x0000 },
-    {  30, 0x0041, 0x00000041, 0x01, 0x00, 0x0000 },
-    {  30, 0x0061, 0x00000041, 0x02, 0x00, 0x0000 },
-    {  30, 0x0041, 0x00000041, 0x03, 0x00, 0x0000 },
-    {  30, 0x0061, 0x04000041, 0x04, 0x00, 0x0000 },
-    {  30, 0x0061, 0x04000041, 0x05, 0x00, 0x0000 },
-    {  30, 0x0061, 0x04000041, 0x06, 0x00, 0x0000 },
-    {  30, 0x0061, 0x04000041, 0x07, 0x00, 0x0000 },
-    {  30, 0x0061, 0x08000041, 0x08, 0x00, 0x0000 },
-    {  30, 0x0061, 0x08000041, 0x09, 0x00, 0x0000 },
-    {  30, 0x0061, 0x08000041, 0x0a, 0x00, 0x0000 },
-    {  30, 0x0061, 0x08000041, 0x0b, 0x00, 0x0000 },
-    {  30, 0x0061, 0x0c000041, 0x0c, 0x00, 0x0000 },
-    {  30, 0x0061, 0x0c000041, 0x0d, 0x00, 0x0000 },
-    {  30, 0x0061, 0x0c000041, 0x0e, 0x00, 0x0000 },
-    {  30, 0x0061, 0x0c000041, 0x0f, 0x00, 0x0000 },
-    {  31, 0x0073, 0x00000053, 0x00, 0x00, 0x0000 },
-    {  31, 0x0053, 0x00000053, 0x01, 0x00, 0x0000 },
-    {  31, 0x0073, 0x00000053, 0x02, 0x00, 0x0000 },
-    {  31, 0x0053, 0x00000053, 0x03, 0x00, 0x0000 },
-    {  31, 0x0073, 0x04000053, 0x04, 0x00, 0x0000 },
-    {  31, 0x0073, 0x04000053, 0x05, 0x00, 0x0000 },
-    {  31, 0x0073, 0x04000053, 0x06, 0x00, 0x0000 },
-    {  31, 0x0073, 0x04000053, 0x07, 0x00, 0x0000 },
-    {  31, 0x0073, 0x08000053, 0x08, 0x00, 0x0000 },
-    {  31, 0x0073, 0x08000053, 0x09, 0x00, 0x0000 },
-    {  31, 0x0073, 0x08000053, 0x0a, 0x00, 0x0000 },
-    {  31, 0x0073, 0x08000053, 0x0b, 0x00, 0x0000 },
-    {  31, 0x0073, 0x0c000053, 0x0c, 0x00, 0x0000 },
-    {  31, 0x0073, 0x0c000053, 0x0d, 0x00, 0x0000 },
-    {  31, 0x0073, 0x0c000053, 0x0e, 0x00, 0x0000 },
-    {  31, 0x0073, 0x0c000053, 0x0f, 0x00, 0x0000 },
-    {  32, 0x0064, 0x00000044, 0x00, 0x00, 0x0000 },
-    {  32, 0x0044, 0x00000044, 0x01, 0x00, 0x0000 },
-    {  32, 0x0064, 0x00000044, 0x02, 0x00, 0x0000 },
-    {  32, 0x0044, 0x00000044, 0x03, 0x00, 0x0000 },
-    {  32, 0x0064, 0x04000044, 0x04, 0x00, 0x0000 },
-    {  32, 0x0064, 0x04000044, 0x05, 0x00, 0x0000 },
-    {  32, 0x0064, 0x04000044, 0x06, 0x00, 0x0000 },
-    {  32, 0x0064, 0x04000044, 0x07, 0x00, 0x0000 },
-    {  32, 0x0064, 0x08000044, 0x08, 0x00, 0x0000 },
-    {  32, 0x0064, 0x08000044, 0x09, 0x00, 0x0000 },
-    {  32, 0x0064, 0x08000044, 0x0a, 0x00, 0x0000 },
-    {  32, 0x0064, 0x08000044, 0x0b, 0x00, 0x0000 },
-    {  32, 0x0064, 0x0c000044, 0x0c, 0x00, 0x0000 },
-    {  32, 0x0064, 0x0c000044, 0x0d, 0x00, 0x0000 },
-    {  32, 0x0064, 0x0c000044, 0x0e, 0x00, 0x0000 },
-    {  32, 0x0064, 0x0c000044, 0x0f, 0x00, 0x0000 },
-    {  33, 0x0066, 0x00000046, 0x00, 0x00, 0x0000 },
-    {  33, 0x0046, 0x00000046, 0x01, 0x00, 0x0000 },
-    {  33, 0x0066, 0x00000046, 0x02, 0x00, 0x0000 },
-    {  33, 0x0046, 0x00000046, 0x03, 0x00, 0x0000 },
-    {  33, 0x0066, 0x04000046, 0x04, 0x00, 0x0000 },
-    {  33, 0x0066, 0x04000046, 0x05, 0x00, 0x0000 },
-    {  33, 0x0066, 0x04000046, 0x06, 0x00, 0x0000 },
-    {  33, 0x0066, 0x04000046, 0x07, 0x00, 0x0000 },
-    {  33, 0x0066, 0x08000046, 0x08, 0x00, 0x0000 },
-    {  33, 0x0066, 0x08000046, 0x09, 0x00, 0x0000 },
-    {  33, 0x0066, 0x08000046, 0x0a, 0x00, 0x0000 },
-    {  33, 0x0066, 0x08000046, 0x0b, 0x00, 0x0000 },
-    {  33, 0x0066, 0x0c000046, 0x0c, 0x00, 0x0000 },
-    {  33, 0x0066, 0x0c000046, 0x0d, 0x00, 0x0000 },
-    {  33, 0x0066, 0x0c000046, 0x0e, 0x00, 0x0000 },
-    {  33, 0x0066, 0x0c000046, 0x0f, 0x00, 0x0000 },
-    {  34, 0x0067, 0x00000047, 0x00, 0x00, 0x0000 },
-    {  34, 0x0047, 0x00000047, 0x01, 0x00, 0x0000 },
-    {  34, 0x0067, 0x00000047, 0x02, 0x00, 0x0000 },
-    {  34, 0x0047, 0x00000047, 0x03, 0x00, 0x0000 },
-    {  34, 0x0067, 0x04000047, 0x04, 0x00, 0x0000 },
-    {  34, 0x0067, 0x04000047, 0x05, 0x00, 0x0000 },
-    {  34, 0x0067, 0x04000047, 0x06, 0x00, 0x0000 },
-    {  34, 0x0067, 0x04000047, 0x07, 0x00, 0x0000 },
-    {  34, 0x0067, 0x08000047, 0x08, 0x00, 0x0000 },
-    {  34, 0x0067, 0x08000047, 0x09, 0x00, 0x0000 },
-    {  34, 0x0067, 0x08000047, 0x0a, 0x00, 0x0000 },
-    {  34, 0x0067, 0x08000047, 0x0b, 0x00, 0x0000 },
-    {  34, 0x0067, 0x0c000047, 0x0c, 0x00, 0x0000 },
-    {  34, 0x0067, 0x0c000047, 0x0d, 0x00, 0x0000 },
-    {  34, 0x0067, 0x0c000047, 0x0e, 0x00, 0x0000 },
-    {  34, 0x0067, 0x0c000047, 0x0f, 0x00, 0x0000 },
-    {  35, 0x0068, 0x00000048, 0x00, 0x00, 0x0000 },
-    {  35, 0x0048, 0x00000048, 0x01, 0x00, 0x0000 },
-    {  35, 0x0068, 0x00000048, 0x02, 0x00, 0x0000 },
-    {  35, 0x0048, 0x00000048, 0x03, 0x00, 0x0000 },
-    {  35, 0x0068, 0x04000048, 0x04, 0x00, 0x0000 },
-    {  35, 0x0068, 0x04000048, 0x05, 0x00, 0x0000 },
-    {  35, 0x0068, 0x04000048, 0x06, 0x00, 0x0000 },
-    {  35, 0x0068, 0x04000048, 0x07, 0x00, 0x0000 },
-    {  35, 0x0068, 0x08000048, 0x08, 0x00, 0x0000 },
-    {  35, 0x0068, 0x08000048, 0x09, 0x00, 0x0000 },
-    {  35, 0x0068, 0x08000048, 0x0a, 0x00, 0x0000 },
-    {  35, 0x0068, 0x08000048, 0x0b, 0x00, 0x0000 },
-    {  35, 0x0068, 0x0c000048, 0x0c, 0x00, 0x0000 },
-    {  35, 0x0068, 0x0c000048, 0x0d, 0x00, 0x0000 },
-    {  35, 0x0068, 0x0c000048, 0x0e, 0x00, 0x0000 },
-    {  35, 0x0068, 0x0c000048, 0x0f, 0x00, 0x0000 },
-    {  36, 0x006a, 0x0000004a, 0x00, 0x00, 0x0000 },
-    {  36, 0x004a, 0x0000004a, 0x01, 0x00, 0x0000 },
-    {  36, 0x006a, 0x0000004a, 0x02, 0x00, 0x0000 },
-    {  36, 0x004a, 0x0000004a, 0x03, 0x00, 0x0000 },
-    {  36, 0x006a, 0x0400004a, 0x04, 0x00, 0x0000 },
-    {  36, 0x006a, 0x0400004a, 0x05, 0x00, 0x0000 },
-    {  36, 0x006a, 0x0400004a, 0x06, 0x00, 0x0000 },
-    {  36, 0x006a, 0x0400004a, 0x07, 0x00, 0x0000 },
-    {  36, 0x006a, 0x0800004a, 0x08, 0x00, 0x0000 },
-    {  36, 0x006a, 0x0800004a, 0x09, 0x00, 0x0000 },
-    {  36, 0x006a, 0x0800004a, 0x0a, 0x00, 0x0000 },
-    {  36, 0x006a, 0x0800004a, 0x0b, 0x00, 0x0000 },
-    {  36, 0x006a, 0x0c00004a, 0x0c, 0x00, 0x0000 },
-    {  36, 0x006a, 0x0c00004a, 0x0d, 0x00, 0x0000 },
-    {  36, 0x006a, 0x0c00004a, 0x0e, 0x00, 0x0000 },
-    {  36, 0x006a, 0x0c00004a, 0x0f, 0x00, 0x0000 },
-    {  37, 0x006b, 0x0000004b, 0x00, 0x00, 0x0000 },
-    {  37, 0x004b, 0x0000004b, 0x01, 0x00, 0x0000 },
-    {  37, 0x006b, 0x0000004b, 0x02, 0x00, 0x0000 },
-    {  37, 0x004b, 0x0000004b, 0x03, 0x00, 0x0000 },
-    {  37, 0x006b, 0x0400004b, 0x04, 0x00, 0x0000 },
-    {  37, 0x006b, 0x0400004b, 0x05, 0x00, 0x0000 },
-    {  37, 0x006b, 0x0400004b, 0x06, 0x00, 0x0000 },
-    {  37, 0x006b, 0x0400004b, 0x07, 0x00, 0x0000 },
-    {  37, 0x006b, 0x0800004b, 0x08, 0x00, 0x0000 },
-    {  37, 0x006b, 0x0800004b, 0x09, 0x00, 0x0000 },
-    {  37, 0x006b, 0x0800004b, 0x0a, 0x00, 0x0000 },
-    {  37, 0x006b, 0x0800004b, 0x0b, 0x00, 0x0000 },
-    {  37, 0x006b, 0x0c00004b, 0x0c, 0x00, 0x0000 },
-    {  37, 0x006b, 0x0c00004b, 0x0d, 0x00, 0x0000 },
-    {  37, 0x006b, 0x0c00004b, 0x0e, 0x00, 0x0000 },
-    {  37, 0x006b, 0x0c00004b, 0x0f, 0x00, 0x0000 },
-    {  38, 0x006c, 0x0000004c, 0x00, 0x00, 0x0000 },
-    {  38, 0x004c, 0x0000004c, 0x01, 0x00, 0x0000 },
-    {  38, 0x006c, 0x0000004c, 0x02, 0x00, 0x0000 },
-    {  38, 0x004c, 0x0000004c, 0x03, 0x00, 0x0000 },
-    {  38, 0x006c, 0x0400004c, 0x04, 0x00, 0x0000 },
-    {  38, 0x006c, 0x0400004c, 0x05, 0x00, 0x0000 },
-    {  38, 0x006c, 0x0400004c, 0x06, 0x00, 0x0000 },
-    {  38, 0x006c, 0x0400004c, 0x07, 0x00, 0x0000 },
-    {  38, 0x006c, 0x0800004c, 0x08, 0x00, 0x0000 },
-    {  38, 0x006c, 0x0800004c, 0x09, 0x00, 0x0000 },
-    {  38, 0x006c, 0x0800004c, 0x0a, 0x00, 0x0000 },
-    {  38, 0x006c, 0x0800004c, 0x0b, 0x00, 0x0000 },
-    {  38, 0x006c, 0x0c00004c, 0x0c, 0x00, 0x0000 },
-    {  38, 0x006c, 0x0c00004c, 0x0d, 0x00, 0x0000 },
-    {  38, 0x006c, 0x0c00004c, 0x0e, 0x00, 0x0000 },
-    {  38, 0x006c, 0x0c00004c, 0x0f, 0x00, 0x0000 },
+    {  30, 0x0061, 0x00000041, 0x00, 0x02, 0x0000 },
+    {  30, 0x0041, 0x00000041, 0x01, 0x02, 0x0000 },
+    {  30, 0x0061, 0x00000041, 0x02, 0x02, 0x0000 },
+    {  30, 0x0041, 0x00000041, 0x03, 0x02, 0x0000 },
+    {  30, 0x0061, 0x04000041, 0x04, 0x02, 0x0000 },
+    {  30, 0x0061, 0x04000041, 0x05, 0x02, 0x0000 },
+    {  30, 0x0061, 0x04000041, 0x06, 0x02, 0x0000 },
+    {  30, 0x0061, 0x04000041, 0x07, 0x02, 0x0000 },
+    {  30, 0x0061, 0x08000041, 0x08, 0x02, 0x0000 },
+    {  30, 0x0061, 0x08000041, 0x09, 0x02, 0x0000 },
+    {  30, 0x0061, 0x08000041, 0x0a, 0x02, 0x0000 },
+    {  30, 0x0061, 0x08000041, 0x0b, 0x02, 0x0000 },
+    {  30, 0x0061, 0x0c000041, 0x0c, 0x02, 0x0000 },
+    {  30, 0x0061, 0x0c000041, 0x0d, 0x02, 0x0000 },
+    {  30, 0x0061, 0x0c000041, 0x0e, 0x02, 0x0000 },
+    {  30, 0x0061, 0x0c000041, 0x0f, 0x02, 0x0000 },
+    {  31, 0x0073, 0x00000053, 0x00, 0x02, 0x0000 },
+    {  31, 0x0053, 0x00000053, 0x01, 0x02, 0x0000 },
+    {  31, 0x0073, 0x00000053, 0x02, 0x02, 0x0000 },
+    {  31, 0x0053, 0x00000053, 0x03, 0x02, 0x0000 },
+    {  31, 0x0073, 0x04000053, 0x04, 0x02, 0x0000 },
+    {  31, 0x0073, 0x04000053, 0x05, 0x02, 0x0000 },
+    {  31, 0x0073, 0x04000053, 0x06, 0x02, 0x0000 },
+    {  31, 0x0073, 0x04000053, 0x07, 0x02, 0x0000 },
+    {  31, 0x0073, 0x08000053, 0x08, 0x02, 0x0000 },
+    {  31, 0x0073, 0x08000053, 0x09, 0x02, 0x0000 },
+    {  31, 0x0073, 0x08000053, 0x0a, 0x02, 0x0000 },
+    {  31, 0x0073, 0x08000053, 0x0b, 0x02, 0x0000 },
+    {  31, 0x0073, 0x0c000053, 0x0c, 0x02, 0x0000 },
+    {  31, 0x0073, 0x0c000053, 0x0d, 0x02, 0x0000 },
+    {  31, 0x0073, 0x0c000053, 0x0e, 0x02, 0x0000 },
+    {  31, 0x0073, 0x0c000053, 0x0f, 0x02, 0x0000 },
+    {  32, 0x0064, 0x00000044, 0x00, 0x02, 0x0000 },
+    {  32, 0x0044, 0x00000044, 0x01, 0x02, 0x0000 },
+    {  32, 0x0064, 0x00000044, 0x02, 0x02, 0x0000 },
+    {  32, 0x0044, 0x00000044, 0x03, 0x02, 0x0000 },
+    {  32, 0x0064, 0x04000044, 0x04, 0x02, 0x0000 },
+    {  32, 0x0064, 0x04000044, 0x05, 0x02, 0x0000 },
+    {  32, 0x0064, 0x04000044, 0x06, 0x02, 0x0000 },
+    {  32, 0x0064, 0x04000044, 0x07, 0x02, 0x0000 },
+    {  32, 0x0064, 0x08000044, 0x08, 0x02, 0x0000 },
+    {  32, 0x0064, 0x08000044, 0x09, 0x02, 0x0000 },
+    {  32, 0x0064, 0x08000044, 0x0a, 0x02, 0x0000 },
+    {  32, 0x0064, 0x08000044, 0x0b, 0x02, 0x0000 },
+    {  32, 0x0064, 0x0c000044, 0x0c, 0x02, 0x0000 },
+    {  32, 0x0064, 0x0c000044, 0x0d, 0x02, 0x0000 },
+    {  32, 0x0064, 0x0c000044, 0x0e, 0x02, 0x0000 },
+    {  32, 0x0064, 0x0c000044, 0x0f, 0x02, 0x0000 },
+    {  33, 0x0066, 0x00000046, 0x00, 0x02, 0x0000 },
+    {  33, 0x0046, 0x00000046, 0x01, 0x02, 0x0000 },
+    {  33, 0x0066, 0x00000046, 0x02, 0x02, 0x0000 },
+    {  33, 0x0046, 0x00000046, 0x03, 0x02, 0x0000 },
+    {  33, 0x0066, 0x04000046, 0x04, 0x02, 0x0000 },
+    {  33, 0x0066, 0x04000046, 0x05, 0x02, 0x0000 },
+    {  33, 0x0066, 0x04000046, 0x06, 0x02, 0x0000 },
+    {  33, 0x0066, 0x04000046, 0x07, 0x02, 0x0000 },
+    {  33, 0x0066, 0x08000046, 0x08, 0x02, 0x0000 },
+    {  33, 0x0066, 0x08000046, 0x09, 0x02, 0x0000 },
+    {  33, 0x0066, 0x08000046, 0x0a, 0x02, 0x0000 },
+    {  33, 0x0066, 0x08000046, 0x0b, 0x02, 0x0000 },
+    {  33, 0x0066, 0x0c000046, 0x0c, 0x02, 0x0000 },
+    {  33, 0x0066, 0x0c000046, 0x0d, 0x02, 0x0000 },
+    {  33, 0x0066, 0x0c000046, 0x0e, 0x02, 0x0000 },
+    {  33, 0x0066, 0x0c000046, 0x0f, 0x02, 0x0000 },
+    {  34, 0x0067, 0x00000047, 0x00, 0x02, 0x0000 },
+    {  34, 0x0047, 0x00000047, 0x01, 0x02, 0x0000 },
+    {  34, 0x0067, 0x00000047, 0x02, 0x02, 0x0000 },
+    {  34, 0x0047, 0x00000047, 0x03, 0x02, 0x0000 },
+    {  34, 0x0067, 0x04000047, 0x04, 0x02, 0x0000 },
+    {  34, 0x0067, 0x04000047, 0x05, 0x02, 0x0000 },
+    {  34, 0x0067, 0x04000047, 0x06, 0x02, 0x0000 },
+    {  34, 0x0067, 0x04000047, 0x07, 0x02, 0x0000 },
+    {  34, 0x0067, 0x08000047, 0x08, 0x02, 0x0000 },
+    {  34, 0x0067, 0x08000047, 0x09, 0x02, 0x0000 },
+    {  34, 0x0067, 0x08000047, 0x0a, 0x02, 0x0000 },
+    {  34, 0x0067, 0x08000047, 0x0b, 0x02, 0x0000 },
+    {  34, 0x0067, 0x0c000047, 0x0c, 0x02, 0x0000 },
+    {  34, 0x0067, 0x0c000047, 0x0d, 0x02, 0x0000 },
+    {  34, 0x0067, 0x0c000047, 0x0e, 0x02, 0x0000 },
+    {  34, 0x0067, 0x0c000047, 0x0f, 0x02, 0x0000 },
+    {  35, 0x0068, 0x00000048, 0x00, 0x02, 0x0000 },
+    {  35, 0x0048, 0x00000048, 0x01, 0x02, 0x0000 },
+    {  35, 0x0068, 0x00000048, 0x02, 0x02, 0x0000 },
+    {  35, 0x0048, 0x00000048, 0x03, 0x02, 0x0000 },
+    {  35, 0x0068, 0x04000048, 0x04, 0x02, 0x0000 },
+    {  35, 0x0068, 0x04000048, 0x05, 0x02, 0x0000 },
+    {  35, 0x0068, 0x04000048, 0x06, 0x02, 0x0000 },
+    {  35, 0x0068, 0x04000048, 0x07, 0x02, 0x0000 },
+    {  35, 0x0068, 0x08000048, 0x08, 0x02, 0x0000 },
+    {  35, 0x0068, 0x08000048, 0x09, 0x02, 0x0000 },
+    {  35, 0x0068, 0x08000048, 0x0a, 0x02, 0x0000 },
+    {  35, 0x0068, 0x08000048, 0x0b, 0x02, 0x0000 },
+    {  35, 0x0068, 0x0c000048, 0x0c, 0x02, 0x0000 },
+    {  35, 0x0068, 0x0c000048, 0x0d, 0x02, 0x0000 },
+    {  35, 0x0068, 0x0c000048, 0x0e, 0x02, 0x0000 },
+    {  35, 0x0068, 0x0c000048, 0x0f, 0x02, 0x0000 },
+    {  36, 0x006a, 0x0000004a, 0x00, 0x02, 0x0000 },
+    {  36, 0x004a, 0x0000004a, 0x01, 0x02, 0x0000 },
+    {  36, 0x006a, 0x0000004a, 0x02, 0x02, 0x0000 },
+    {  36, 0x004a, 0x0000004a, 0x03, 0x02, 0x0000 },
+    {  36, 0x006a, 0x0400004a, 0x04, 0x02, 0x0000 },
+    {  36, 0x006a, 0x0400004a, 0x05, 0x02, 0x0000 },
+    {  36, 0x006a, 0x0400004a, 0x06, 0x02, 0x0000 },
+    {  36, 0x006a, 0x0400004a, 0x07, 0x02, 0x0000 },
+    {  36, 0x006a, 0x0800004a, 0x08, 0x02, 0x0000 },
+    {  36, 0x006a, 0x0800004a, 0x09, 0x02, 0x0000 },
+    {  36, 0x006a, 0x0800004a, 0x0a, 0x02, 0x0000 },
+    {  36, 0x006a, 0x0800004a, 0x0b, 0x02, 0x0000 },
+    {  36, 0x006a, 0x0c00004a, 0x0c, 0x02, 0x0000 },
+    {  36, 0x006a, 0x0c00004a, 0x0d, 0x02, 0x0000 },
+    {  36, 0x006a, 0x0c00004a, 0x0e, 0x02, 0x0000 },
+    {  36, 0x006a, 0x0c00004a, 0x0f, 0x02, 0x0000 },
+    {  37, 0x006b, 0x0000004b, 0x00, 0x02, 0x0000 },
+    {  37, 0x004b, 0x0000004b, 0x01, 0x02, 0x0000 },
+    {  37, 0x006b, 0x0000004b, 0x02, 0x02, 0x0000 },
+    {  37, 0x004b, 0x0000004b, 0x03, 0x02, 0x0000 },
+    {  37, 0x006b, 0x0400004b, 0x04, 0x02, 0x0000 },
+    {  37, 0x006b, 0x0400004b, 0x05, 0x02, 0x0000 },
+    {  37, 0x006b, 0x0400004b, 0x06, 0x02, 0x0000 },
+    {  37, 0x006b, 0x0400004b, 0x07, 0x02, 0x0000 },
+    {  37, 0x006b, 0x0800004b, 0x08, 0x02, 0x0000 },
+    {  37, 0x006b, 0x0800004b, 0x09, 0x02, 0x0000 },
+    {  37, 0x006b, 0x0800004b, 0x0a, 0x02, 0x0000 },
+    {  37, 0x006b, 0x0800004b, 0x0b, 0x02, 0x0000 },
+    {  37, 0x006b, 0x0c00004b, 0x0c, 0x02, 0x0000 },
+    {  37, 0x006b, 0x0c00004b, 0x0d, 0x02, 0x0000 },
+    {  37, 0x006b, 0x0c00004b, 0x0e, 0x02, 0x0000 },
+    {  37, 0x006b, 0x0c00004b, 0x0f, 0x02, 0x0000 },
+    {  38, 0x006c, 0x0000004c, 0x00, 0x02, 0x0000 },
+    {  38, 0x004c, 0x0000004c, 0x01, 0x02, 0x0000 },
+    {  38, 0x006c, 0x0000004c, 0x02, 0x02, 0x0000 },
+    {  38, 0x004c, 0x0000004c, 0x03, 0x02, 0x0000 },
+    {  38, 0x006c, 0x0400004c, 0x04, 0x02, 0x0000 },
+    {  38, 0x006c, 0x0400004c, 0x05, 0x02, 0x0000 },
+    {  38, 0x006c, 0x0400004c, 0x06, 0x02, 0x0000 },
+    {  38, 0x006c, 0x0400004c, 0x07, 0x02, 0x0000 },
+    {  38, 0x006c, 0x0800004c, 0x08, 0x02, 0x0000 },
+    {  38, 0x006c, 0x0800004c, 0x09, 0x02, 0x0000 },
+    {  38, 0x006c, 0x0800004c, 0x0a, 0x02, 0x0000 },
+    {  38, 0x006c, 0x0800004c, 0x0b, 0x02, 0x0000 },
+    {  38, 0x006c, 0x0c00004c, 0x0c, 0x02, 0x0000 },
+    {  38, 0x006c, 0x0c00004c, 0x0d, 0x02, 0x0000 },
+    {  38, 0x006c, 0x0c00004c, 0x0e, 0x02, 0x0000 },
+    {  38, 0x006c, 0x0c00004c, 0x0f, 0x02, 0x0000 },
     {  39, 0x003b, 0x0000003b, 0x00, 0x00, 0x0000 },
     {  39, 0x003a, 0x0000003a, 0x01, 0x00, 0x0000 },
     {  40, 0x0027, 0x00000027, 0x00, 0x00, 0x0000 },
@@ -418,118 +418,118 @@ const QEvdevKeyboardMap::Mapping QEvdevKeyboardHandler::s_keymap_default[] = {
     {  43, 0x005c, 0x0000005c, 0x00, 0x00, 0x0000 },
     {  43, 0x007c, 0x0000007c, 0x01, 0x00, 0x0000 },
     {  43, 0x005c, 0x0400005c, 0x04, 0x00, 0x0000 },
-    {  44, 0x007a, 0x0000005a, 0x00, 0x00, 0x0000 },
-    {  44, 0x005a, 0x0000005a, 0x01, 0x00, 0x0000 },
-    {  44, 0x007a, 0x0000005a, 0x02, 0x00, 0x0000 },
-    {  44, 0x005a, 0x0000005a, 0x03, 0x00, 0x0000 },
-    {  44, 0x007a, 0x0400005a, 0x04, 0x00, 0x0000 },
-    {  44, 0x007a, 0x0400005a, 0x05, 0x00, 0x0000 },
-    {  44, 0x007a, 0x0400005a, 0x06, 0x00, 0x0000 },
-    {  44, 0x007a, 0x0400005a, 0x07, 0x00, 0x0000 },
-    {  44, 0x007a, 0x0800005a, 0x08, 0x00, 0x0000 },
-    {  44, 0x007a, 0x0800005a, 0x09, 0x00, 0x0000 },
-    {  44, 0x007a, 0x0800005a, 0x0a, 0x00, 0x0000 },
-    {  44, 0x007a, 0x0800005a, 0x0b, 0x00, 0x0000 },
-    {  44, 0x007a, 0x0c00005a, 0x0c, 0x00, 0x0000 },
-    {  44, 0x007a, 0x0c00005a, 0x0d, 0x00, 0x0000 },
-    {  44, 0x007a, 0x0c00005a, 0x0e, 0x00, 0x0000 },
-    {  44, 0x007a, 0x0c00005a, 0x0f, 0x00, 0x0000 },
-    {  45, 0x0078, 0x00000058, 0x00, 0x00, 0x0000 },
-    {  45, 0x0058, 0x00000058, 0x01, 0x00, 0x0000 },
-    {  45, 0x0078, 0x00000058, 0x02, 0x00, 0x0000 },
-    {  45, 0x0058, 0x00000058, 0x03, 0x00, 0x0000 },
-    {  45, 0x0078, 0x04000058, 0x04, 0x00, 0x0000 },
-    {  45, 0x0078, 0x04000058, 0x05, 0x00, 0x0000 },
-    {  45, 0x0078, 0x04000058, 0x06, 0x00, 0x0000 },
-    {  45, 0x0078, 0x04000058, 0x07, 0x00, 0x0000 },
-    {  45, 0x0078, 0x08000058, 0x08, 0x00, 0x0000 },
-    {  45, 0x0078, 0x08000058, 0x09, 0x00, 0x0000 },
-    {  45, 0x0078, 0x08000058, 0x0a, 0x00, 0x0000 },
-    {  45, 0x0078, 0x08000058, 0x0b, 0x00, 0x0000 },
-    {  45, 0x0078, 0x0c000058, 0x0c, 0x00, 0x0000 },
-    {  45, 0x0078, 0x0c000058, 0x0d, 0x00, 0x0000 },
-    {  45, 0x0078, 0x0c000058, 0x0e, 0x00, 0x0000 },
-    {  45, 0x0078, 0x0c000058, 0x0f, 0x00, 0x0000 },
-    {  46, 0x0063, 0x00000043, 0x00, 0x00, 0x0000 },
-    {  46, 0x0043, 0x00000043, 0x01, 0x00, 0x0000 },
-    {  46, 0x0063, 0x00000043, 0x02, 0x00, 0x0000 },
-    {  46, 0x0043, 0x00000043, 0x03, 0x00, 0x0000 },
-    {  46, 0x0063, 0x04000043, 0x04, 0x00, 0x0000 },
-    {  46, 0x0063, 0x04000043, 0x05, 0x00, 0x0000 },
-    {  46, 0x0063, 0x04000043, 0x06, 0x00, 0x0000 },
-    {  46, 0x0063, 0x04000043, 0x07, 0x00, 0x0000 },
-    {  46, 0x0063, 0x08000043, 0x08, 0x00, 0x0000 },
-    {  46, 0x0063, 0x08000043, 0x09, 0x00, 0x0000 },
-    {  46, 0x0063, 0x08000043, 0x0a, 0x00, 0x0000 },
-    {  46, 0x0063, 0x08000043, 0x0b, 0x00, 0x0000 },
-    {  46, 0x0063, 0x0c000043, 0x0c, 0x00, 0x0000 },
-    {  46, 0x0063, 0x0c000043, 0x0d, 0x00, 0x0000 },
-    {  46, 0x0063, 0x0c000043, 0x0e, 0x00, 0x0000 },
-    {  46, 0x0063, 0x0c000043, 0x0f, 0x00, 0x0000 },
-    {  47, 0x0076, 0x00000056, 0x00, 0x00, 0x0000 },
-    {  47, 0x0056, 0x00000056, 0x01, 0x00, 0x0000 },
-    {  47, 0x0076, 0x00000056, 0x02, 0x00, 0x0000 },
-    {  47, 0x0056, 0x00000056, 0x03, 0x00, 0x0000 },
-    {  47, 0x0076, 0x04000056, 0x04, 0x00, 0x0000 },
-    {  47, 0x0076, 0x04000056, 0x05, 0x00, 0x0000 },
-    {  47, 0x0076, 0x04000056, 0x06, 0x00, 0x0000 },
-    {  47, 0x0076, 0x04000056, 0x07, 0x00, 0x0000 },
-    {  47, 0x0076, 0x08000056, 0x08, 0x00, 0x0000 },
-    {  47, 0x0076, 0x08000056, 0x09, 0x00, 0x0000 },
-    {  47, 0x0076, 0x08000056, 0x0a, 0x00, 0x0000 },
-    {  47, 0x0076, 0x08000056, 0x0b, 0x00, 0x0000 },
-    {  47, 0x0076, 0x0c000056, 0x0c, 0x00, 0x0000 },
-    {  47, 0x0076, 0x0c000056, 0x0d, 0x00, 0x0000 },
-    {  47, 0x0076, 0x0c000056, 0x0e, 0x00, 0x0000 },
-    {  47, 0x0076, 0x0c000056, 0x0f, 0x00, 0x0000 },
-    {  48, 0x0062, 0x00000042, 0x00, 0x00, 0x0000 },
-    {  48, 0x0042, 0x00000042, 0x01, 0x00, 0x0000 },
-    {  48, 0x0062, 0x00000042, 0x02, 0x00, 0x0000 },
-    {  48, 0x0042, 0x00000042, 0x03, 0x00, 0x0000 },
-    {  48, 0x0062, 0x04000042, 0x04, 0x00, 0x0000 },
-    {  48, 0x0062, 0x04000042, 0x05, 0x00, 0x0000 },
-    {  48, 0x0062, 0x04000042, 0x06, 0x00, 0x0000 },
-    {  48, 0x0062, 0x04000042, 0x07, 0x00, 0x0000 },
-    {  48, 0x0062, 0x08000042, 0x08, 0x00, 0x0000 },
-    {  48, 0x0062, 0x08000042, 0x09, 0x00, 0x0000 },
-    {  48, 0x0062, 0x08000042, 0x0a, 0x00, 0x0000 },
-    {  48, 0x0062, 0x08000042, 0x0b, 0x00, 0x0000 },
-    {  48, 0x0062, 0x0c000042, 0x0c, 0x00, 0x0000 },
-    {  48, 0x0062, 0x0c000042, 0x0d, 0x00, 0x0000 },
-    {  48, 0x0062, 0x0c000042, 0x0e, 0x00, 0x0000 },
-    {  48, 0x0062, 0x0c000042, 0x0f, 0x00, 0x0000 },
-    {  49, 0x006e, 0x0000004e, 0x00, 0x00, 0x0000 },
-    {  49, 0x004e, 0x0000004e, 0x01, 0x00, 0x0000 },
-    {  49, 0x006e, 0x0000004e, 0x02, 0x00, 0x0000 },
-    {  49, 0x004e, 0x0000004e, 0x03, 0x00, 0x0000 },
-    {  49, 0x006e, 0x0400004e, 0x04, 0x00, 0x0000 },
-    {  49, 0x006e, 0x0400004e, 0x05, 0x00, 0x0000 },
-    {  49, 0x006e, 0x0400004e, 0x06, 0x00, 0x0000 },
-    {  49, 0x006e, 0x0400004e, 0x07, 0x00, 0x0000 },
-    {  49, 0x006e, 0x0800004e, 0x08, 0x00, 0x0000 },
-    {  49, 0x006e, 0x0800004e, 0x09, 0x00, 0x0000 },
-    {  49, 0x006e, 0x0800004e, 0x0a, 0x00, 0x0000 },
-    {  49, 0x006e, 0x0800004e, 0x0b, 0x00, 0x0000 },
-    {  49, 0x006e, 0x0c00004e, 0x0c, 0x00, 0x0000 },
-    {  49, 0x006e, 0x0c00004e, 0x0d, 0x00, 0x0000 },
-    {  49, 0x006e, 0x0c00004e, 0x0e, 0x00, 0x0000 },
-    {  49, 0x006e, 0x0c00004e, 0x0f, 0x00, 0x0000 },
-    {  50, 0x006d, 0x0000004d, 0x00, 0x00, 0x0000 },
-    {  50, 0x004d, 0x0000004d, 0x01, 0x00, 0x0000 },
-    {  50, 0x006d, 0x0000004d, 0x02, 0x00, 0x0000 },
-    {  50, 0x004d, 0x0000004d, 0x03, 0x00, 0x0000 },
-    {  50, 0x006d, 0x0400004d, 0x04, 0x00, 0x0000 },
-    {  50, 0x006d, 0x0400004d, 0x05, 0x00, 0x0000 },
-    {  50, 0x006d, 0x0400004d, 0x06, 0x00, 0x0000 },
-    {  50, 0x006d, 0x0400004d, 0x07, 0x00, 0x0000 },
-    {  50, 0x006d, 0x0800004d, 0x08, 0x00, 0x0000 },
-    {  50, 0x006d, 0x0800004d, 0x09, 0x00, 0x0000 },
-    {  50, 0x006d, 0x0800004d, 0x0a, 0x00, 0x0000 },
-    {  50, 0x006d, 0x0800004d, 0x0b, 0x00, 0x0000 },
-    {  50, 0x006d, 0x0c00004d, 0x0c, 0x00, 0x0000 },
-    {  50, 0x006d, 0x0c00004d, 0x0d, 0x00, 0x0000 },
-    {  50, 0x006d, 0x0c00004d, 0x0e, 0x00, 0x0000 },
-    {  50, 0x006d, 0x0c00004d, 0x0f, 0x00, 0x0000 },
+    {  44, 0x007a, 0x0000005a, 0x00, 0x02, 0x0000 },
+    {  44, 0x005a, 0x0000005a, 0x01, 0x02, 0x0000 },
+    {  44, 0x007a, 0x0000005a, 0x02, 0x02, 0x0000 },
+    {  44, 0x005a, 0x0000005a, 0x03, 0x02, 0x0000 },
+    {  44, 0x007a, 0x0400005a, 0x04, 0x02, 0x0000 },
+    {  44, 0x007a, 0x0400005a, 0x05, 0x02, 0x0000 },
+    {  44, 0x007a, 0x0400005a, 0x06, 0x02, 0x0000 },
+    {  44, 0x007a, 0x0400005a, 0x07, 0x02, 0x0000 },
+    {  44, 0x007a, 0x0800005a, 0x08, 0x02, 0x0000 },
+    {  44, 0x007a, 0x0800005a, 0x09, 0x02, 0x0000 },
+    {  44, 0x007a, 0x0800005a, 0x0a, 0x02, 0x0000 },
+    {  44, 0x007a, 0x0800005a, 0x0b, 0x02, 0x0000 },
+    {  44, 0x007a, 0x0c00005a, 0x0c, 0x02, 0x0000 },
+    {  44, 0x007a, 0x0c00005a, 0x0d, 0x02, 0x0000 },
+    {  44, 0x007a, 0x0c00005a, 0x0e, 0x02, 0x0000 },
+    {  44, 0x007a, 0x0c00005a, 0x0f, 0x02, 0x0000 },
+    {  45, 0x0078, 0x00000058, 0x00, 0x02, 0x0000 },
+    {  45, 0x0058, 0x00000058, 0x01, 0x02, 0x0000 },
+    {  45, 0x0078, 0x00000058, 0x02, 0x02, 0x0000 },
+    {  45, 0x0058, 0x00000058, 0x03, 0x02, 0x0000 },
+    {  45, 0x0078, 0x04000058, 0x04, 0x02, 0x0000 },
+    {  45, 0x0078, 0x04000058, 0x05, 0x02, 0x0000 },
+    {  45, 0x0078, 0x04000058, 0x06, 0x02, 0x0000 },
+    {  45, 0x0078, 0x04000058, 0x07, 0x02, 0x0000 },
+    {  45, 0x0078, 0x08000058, 0x08, 0x02, 0x0000 },
+    {  45, 0x0078, 0x08000058, 0x09, 0x02, 0x0000 },
+    {  45, 0x0078, 0x08000058, 0x0a, 0x02, 0x0000 },
+    {  45, 0x0078, 0x08000058, 0x0b, 0x02, 0x0000 },
+    {  45, 0x0078, 0x0c000058, 0x0c, 0x02, 0x0000 },
+    {  45, 0x0078, 0x0c000058, 0x0d, 0x02, 0x0000 },
+    {  45, 0x0078, 0x0c000058, 0x0e, 0x02, 0x0000 },
+    {  45, 0x0078, 0x0c000058, 0x0f, 0x02, 0x0000 },
+    {  46, 0x0063, 0x00000043, 0x00, 0x02, 0x0000 },
+    {  46, 0x0043, 0x00000043, 0x01, 0x02, 0x0000 },
+    {  46, 0x0063, 0x00000043, 0x02, 0x02, 0x0000 },
+    {  46, 0x0043, 0x00000043, 0x03, 0x02, 0x0000 },
+    {  46, 0x0063, 0x04000043, 0x04, 0x02, 0x0000 },
+    {  46, 0x0063, 0x04000043, 0x05, 0x02, 0x0000 },
+    {  46, 0x0063, 0x04000043, 0x06, 0x02, 0x0000 },
+    {  46, 0x0063, 0x04000043, 0x07, 0x02, 0x0000 },
+    {  46, 0x0063, 0x08000043, 0x08, 0x02, 0x0000 },
+    {  46, 0x0063, 0x08000043, 0x09, 0x02, 0x0000 },
+    {  46, 0x0063, 0x08000043, 0x0a, 0x02, 0x0000 },
+    {  46, 0x0063, 0x08000043, 0x0b, 0x02, 0x0000 },
+    {  46, 0x0063, 0x0c000043, 0x0c, 0x02, 0x0000 },
+    {  46, 0x0063, 0x0c000043, 0x0d, 0x02, 0x0000 },
+    {  46, 0x0063, 0x0c000043, 0x0e, 0x02, 0x0000 },
+    {  46, 0x0063, 0x0c000043, 0x0f, 0x02, 0x0000 },
+    {  47, 0x0076, 0x00000056, 0x00, 0x02, 0x0000 },
+    {  47, 0x0056, 0x00000056, 0x01, 0x02, 0x0000 },
+    {  47, 0x0076, 0x00000056, 0x02, 0x02, 0x0000 },
+    {  47, 0x0056, 0x00000056, 0x03, 0x02, 0x0000 },
+    {  47, 0x0076, 0x04000056, 0x04, 0x02, 0x0000 },
+    {  47, 0x0076, 0x04000056, 0x05, 0x02, 0x0000 },
+    {  47, 0x0076, 0x04000056, 0x06, 0x02, 0x0000 },
+    {  47, 0x0076, 0x04000056, 0x07, 0x02, 0x0000 },
+    {  47, 0x0076, 0x08000056, 0x08, 0x02, 0x0000 },
+    {  47, 0x0076, 0x08000056, 0x09, 0x02, 0x0000 },
+    {  47, 0x0076, 0x08000056, 0x0a, 0x02, 0x0000 },
+    {  47, 0x0076, 0x08000056, 0x0b, 0x02, 0x0000 },
+    {  47, 0x0076, 0x0c000056, 0x0c, 0x02, 0x0000 },
+    {  47, 0x0076, 0x0c000056, 0x0d, 0x02, 0x0000 },
+    {  47, 0x0076, 0x0c000056, 0x0e, 0x02, 0x0000 },
+    {  47, 0x0076, 0x0c000056, 0x0f, 0x02, 0x0000 },
+    {  48, 0x0062, 0x00000042, 0x00, 0x02, 0x0000 },
+    {  48, 0x0042, 0x00000042, 0x01, 0x02, 0x0000 },
+    {  48, 0x0062, 0x00000042, 0x02, 0x02, 0x0000 },
+    {  48, 0x0042, 0x00000042, 0x03, 0x02, 0x0000 },
+    {  48, 0x0062, 0x04000042, 0x04, 0x02, 0x0000 },
+    {  48, 0x0062, 0x04000042, 0x05, 0x02, 0x0000 },
+    {  48, 0x0062, 0x04000042, 0x06, 0x02, 0x0000 },
+    {  48, 0x0062, 0x04000042, 0x07, 0x02, 0x0000 },
+    {  48, 0x0062, 0x08000042, 0x08, 0x02, 0x0000 },
+    {  48, 0x0062, 0x08000042, 0x09, 0x02, 0x0000 },
+    {  48, 0x0062, 0x08000042, 0x0a, 0x02, 0x0000 },
+    {  48, 0x0062, 0x08000042, 0x0b, 0x02, 0x0000 },
+    {  48, 0x0062, 0x0c000042, 0x0c, 0x02, 0x0000 },
+    {  48, 0x0062, 0x0c000042, 0x0d, 0x02, 0x0000 },
+    {  48, 0x0062, 0x0c000042, 0x0e, 0x02, 0x0000 },
+    {  48, 0x0062, 0x0c000042, 0x0f, 0x02, 0x0000 },
+    {  49, 0x006e, 0x0000004e, 0x00, 0x02, 0x0000 },
+    {  49, 0x004e, 0x0000004e, 0x01, 0x02, 0x0000 },
+    {  49, 0x006e, 0x0000004e, 0x02, 0x02, 0x0000 },
+    {  49, 0x004e, 0x0000004e, 0x03, 0x02, 0x0000 },
+    {  49, 0x006e, 0x0400004e, 0x04, 0x02, 0x0000 },
+    {  49, 0x006e, 0x0400004e, 0x05, 0x02, 0x0000 },
+    {  49, 0x006e, 0x0400004e, 0x06, 0x02, 0x0000 },
+    {  49, 0x006e, 0x0400004e, 0x07, 0x02, 0x0000 },
+    {  49, 0x006e, 0x0800004e, 0x08, 0x02, 0x0000 },
+    {  49, 0x006e, 0x0800004e, 0x09, 0x02, 0x0000 },
+    {  49, 0x006e, 0x0800004e, 0x0a, 0x02, 0x0000 },
+    {  49, 0x006e, 0x0800004e, 0x0b, 0x02, 0x0000 },
+    {  49, 0x006e, 0x0c00004e, 0x0c, 0x02, 0x0000 },
+    {  49, 0x006e, 0x0c00004e, 0x0d, 0x02, 0x0000 },
+    {  49, 0x006e, 0x0c00004e, 0x0e, 0x02, 0x0000 },
+    {  49, 0x006e, 0x0c00004e, 0x0f, 0x02, 0x0000 },
+    {  50, 0x006d, 0x0000004d, 0x00, 0x02, 0x0000 },
+    {  50, 0x004d, 0x0000004d, 0x01, 0x02, 0x0000 },
+    {  50, 0x006d, 0x0000004d, 0x02, 0x02, 0x0000 },
+    {  50, 0x004d, 0x0000004d, 0x03, 0x02, 0x0000 },
+    {  50, 0x006d, 0x0400004d, 0x04, 0x02, 0x0000 },
+    {  50, 0x006d, 0x0400004d, 0x05, 0x02, 0x0000 },
+    {  50, 0x006d, 0x0400004d, 0x06, 0x02, 0x0000 },
+    {  50, 0x006d, 0x0400004d, 0x07, 0x02, 0x0000 },
+    {  50, 0x006d, 0x0800004d, 0x08, 0x02, 0x0000 },
+    {  50, 0x006d, 0x0800004d, 0x09, 0x02, 0x0000 },
+    {  50, 0x006d, 0x0800004d, 0x0a, 0x02, 0x0000 },
+    {  50, 0x006d, 0x0800004d, 0x0b, 0x02, 0x0000 },
+    {  50, 0x006d, 0x0c00004d, 0x0c, 0x02, 0x0000 },
+    {  50, 0x006d, 0x0c00004d, 0x0d, 0x02, 0x0000 },
+    {  50, 0x006d, 0x0c00004d, 0x0e, 0x02, 0x0000 },
+    {  50, 0x006d, 0x0c00004d, 0x0f, 0x02, 0x0000 },
     {  51, 0x002c, 0x0000002c, 0x00, 0x00, 0x0000 },
     {  51, 0x003c, 0x0000003c, 0x01, 0x00, 0x0000 },
     {  51, 0x002c, 0x0100125b, 0x02, 0x01, 0x0000 },
diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
index 26dc116f91..b97923c4b6 100644
--- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
+++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
@@ -235,6 +235,8 @@ QEvdevKeyboardHandler::KeycodeAction QEvdevKeyboardHandler::processKeycode(quint
     const QEvdevKeyboardMap::Mapping *map_plain = 0;
     const QEvdevKeyboardMap::Mapping *map_withmod = 0;
 
+    quint8 modifiers = m_modifiers;
+
     // get a specific and plain mapping for the keycode and the current modifiers
     for (int i = 0; i < m_keymap_size && !(map_plain && map_withmod); ++i) {
         const QEvdevKeyboardMap::Mapping *m = m_keymap + i;
@@ -250,9 +252,12 @@ QEvdevKeyboardHandler::KeycodeAction QEvdevKeyboardHandler::processKeycode(quint
         }
     }
 
+    if (m_locks[0] /*CapsLock*/ && map_withmod && (map_withmod->flags & QEvdevKeyboardMap::IsLetter))
+        modifiers ^= QEvdevKeyboardMap::ModShift;
+
 #ifdef QT_QPA_KEYMAP_DEBUG
     qWarning("Processing key event: keycode=%3d, modifiers=%02x pressed=%d, autorepeat=%d  |  plain=%d, withmod=%d, size=%d", \
-             keycode, m_modifiers, pressed ? 1 : 0, autorepeat ? 1 : 0, \
+             keycode, modifiers, pressed ? 1 : 0, autorepeat ? 1 : 0, \
              map_plain ? map_plain - m_keymap : -1, \
              map_withmod ? map_withmod - m_keymap : -1, \
              m_keymap_size);
@@ -263,7 +268,7 @@ QEvdevKeyboardHandler::KeycodeAction QEvdevKeyboardHandler::processKeycode(quint
     if (!it) {
 #ifdef QT_QPA_KEYMAP_DEBUG
         // we couldn't even find a plain mapping
-        qWarning("Could not find a suitable mapping for keycode: %3d, modifiers: %02x", keycode, m_modifiers);
+        qWarning("Could not find a suitable mapping for keycode: %3d, modifiers: %02x", keycode, modifiers);
 #endif
         return result;
     }
@@ -285,7 +290,7 @@ QEvdevKeyboardHandler::KeycodeAction QEvdevKeyboardHandler::processKeycode(quint
             lock ^= 1;
 
             switch (qtcode) {
-            case Qt::Key_CapsLock  : result = lock ? CapsLockOn : CapsLockOff; m_modifiers ^= QEvdevKeyboardMap::ModShift; break;
+            case Qt::Key_CapsLock  : result = lock ? CapsLockOn : CapsLockOff; break;
             case Qt::Key_NumLock   : result = lock ? NumLockOn : NumLockOff; break;
             case Qt::Key_ScrollLock: result = lock ? ScrollLockOn : ScrollLockOff; break;
             default                : break;
@@ -347,7 +352,7 @@ QEvdevKeyboardHandler::KeycodeAction QEvdevKeyboardHandler::processKeycode(quint
         // so just report the plain mapping with additional modifiers.
         if ((it == map_plain && it != map_withmod) ||
             (map_withmod && !(map_withmod->qtcode & modmask))) {
-            qtcode |= QEvdevKeyboardHandler::toQtModifiers(m_modifiers);
+            qtcode |= QEvdevKeyboardHandler::toQtModifiers(modifiers);
         }
 
         if (m_composing == 2 && first_press && !(it->flags & QEvdevKeyboardMap::IsModifier)) {