diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2010-03-05 10:08:33 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2010-03-05 13:24:38 (GMT) |
| commit | 856f76e44a00a710b1c34eddee5a893a3c0ada6a (patch) | |
| tree | e5335e24cbffd1a4d1c79e0e49490e325ab0cd1f /src/gui/kernel | |
| parent | 4b3b9b792dfe2d25a271f042f23df22e8b9684f6 (diff) | |
| download | Qt-856f76e44a00a710b1c34eddee5a893a3c0ada6a.zip Qt-856f76e44a00a710b1c34eddee5a893a3c0ada6a.tar.gz Qt-856f76e44a00a710b1c34eddee5a893a3c0ada6a.tar.bz2 | |
Fixed key mappings on X11
Merge request #1742 (6c8c1c5322a26d789165783d7df3e29c672690cb) changed the
behavior of one of the keys on X11, this fixes it back and documents that on
X11 the key binding is a bit weird - XF86XK_MyComputer is mapped to
Qt::Key_Launch0, XF86XK_Launch0 is mapped to Qt::Key_Launch3 and so on.
Task-number: QTBUG-7063
Reviewed-by: Marius Storm-Olsen
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qkeymapper_x11.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/kernel/qkeymapper_x11.cpp index 4e6c847..b32b626 100644 --- a/src/gui/kernel/qkeymapper_x11.cpp +++ b/src/gui/kernel/qkeymapper_x11.cpp @@ -1073,8 +1073,8 @@ static const unsigned int KeyTbl[] = { XF86XK_AudioNext, Qt::Key_MediaNext, XF86XK_AudioRecord, Qt::Key_MediaRecord, XF86XK_Mail, Qt::Key_LaunchMail, - XF86XK_MyComputer, Qt::Key_Launch0, - XF86XK_Calculator, Qt::Key_Calculator, + XF86XK_MyComputer, Qt::Key_Launch0, // ### Qt 5: remap properly + XF86XK_Calculator, Qt::Key_Launch1, XF86XK_Memo, Qt::Key_Memo, XF86XK_ToDoList, Qt::Key_ToDoList, XF86XK_Calendar, Qt::Key_Calendar, @@ -1172,7 +1172,7 @@ static const unsigned int KeyTbl[] = { XF86XK_Bluetooth, Qt::Key_Bluetooth, XF86XK_Suspend, Qt::Key_Suspend, XF86XK_Hibernate, Qt::Key_Hibernate, - XF86XK_Launch0, Qt::Key_Launch2, + XF86XK_Launch0, Qt::Key_Launch2, // ### Qt 5: remap properly XF86XK_Launch1, Qt::Key_Launch3, XF86XK_Launch2, Qt::Key_Launch4, XF86XK_Launch3, Qt::Key_Launch5, |