summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
diff options
context:
space:
mode:
authorDenis Dzyubenko <denis.dzyubenko@nokia.com>2010-03-05 10:13:43 (GMT)
committerDenis Dzyubenko <denis.dzyubenko@nokia.com>2010-03-08 11:44:54 (GMT)
commit7c3bb2f35b70605a0b0a535c8cd6090354b09b19 (patch)
treee779a7919c1753713404ca8b845a1820e13ae848 /src/corelib/global
parent9d0dff2d9d49f59b5c6cd0e53cd4d7f042e5d6a6 (diff)
downloadQt-7c3bb2f35b70605a0b0a535c8cd6090354b09b19.zip
Qt-7c3bb2f35b70605a0b0a535c8cd6090354b09b19.tar.gz
Qt-7c3bb2f35b70605a0b0a535c8cd6090354b09b19.tar.bz2
Added two missing keys for X11
On X11 XF86XK_LaunchD is mapped to Qt::Key_LaunchF, however x11 keys LaunchE and LaunchF were not mapped to anything. Reviewed-by: Marius Storm-Olsen
Diffstat (limited to 'src/corelib/global')
-rw-r--r--src/corelib/global/qnamespace.h3
-rw-r--r--src/corelib/global/qnamespace.qdoc2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index f7aea36..89a0c0b 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -1059,6 +1059,9 @@ public:
Key_Suspend = 0x0100010c,
Key_ContrastAdjust = 0x0100010d,
+ Key_LaunchG = 0x0100010e,
+ Key_LaunchH = 0x0100010f,
+
Key_MediaLast = 0x0100ffff,
// Keypad navigation keys
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index 74144b0..76541ca 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -1639,6 +1639,8 @@
\value Key_LaunchD On X11 this key is mapped to XF86XK_LaunchB key for legacy reasons.
\value Key_LaunchE On X11 this key is mapped to XF86XK_LaunchC key for legacy reasons.
\value Key_LaunchF On X11 this key is mapped to XF86XK_LaunchD key for legacy reasons.
+ \value Key_LaunchG On X11 this key is mapped to XF86XK_LaunchE key for legacy reasons.
+ \value Key_LaunchH On X11 this key is mapped to XF86XK_LaunchF key for legacy reasons.
\value Key_MonBrightnessUp
\value Key_MonBrightnessDown
\value Key_KeyboardLightOnOff