diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2010-03-15 04:54:25 (GMT) |
|---|---|---|
| committer | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2010-03-15 04:54:25 (GMT) |
| commit | 4d4ed81c6df7954d89dad554267cba8d3cfd6bde (patch) | |
| tree | f125ef0e8cccd286950c6cdda011ce8a5e7b1fca /src/gui/kernel/qkeymapper_x11.cpp | |
| parent | 751a45bc22aa1f27a5dab3ce18e83c0f699ee05f (diff) | |
| parent | cffc92bac940fd7fcae0a9ff82a54a124d70ebed (diff) | |
| download | Qt-4d4ed81c6df7954d89dad554267cba8d3cfd6bde.zip Qt-4d4ed81c6df7954d89dad554267cba8d3cfd6bde.tar.gz Qt-4d4ed81c6df7954d89dad554267cba8d3cfd6bde.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7
Diffstat (limited to 'src/gui/kernel/qkeymapper_x11.cpp')
| -rw-r--r-- | src/gui/kernel/qkeymapper_x11.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/kernel/qkeymapper_x11.cpp index b32b626..d6d1042 100644 --- a/src/gui/kernel/qkeymapper_x11.cpp +++ b/src/gui/kernel/qkeymapper_x11.cpp @@ -1186,6 +1186,8 @@ static const unsigned int KeyTbl[] = { XF86XK_LaunchB, Qt::Key_LaunchD, XF86XK_LaunchC, Qt::Key_LaunchE, XF86XK_LaunchD, Qt::Key_LaunchF, + XF86XK_LaunchE, Qt::Key_LaunchG, + XF86XK_LaunchF, Qt::Key_LaunchH, // Qtopia keys QTOPIAXK_Select, Qt::Key_Select, |