OSDN Git Service
(root)
/
kde
/
Katie.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c307801
)
Revert "remove now obsolete workaround for X11 macros"
author
Ivailo Monev
<xakepa10@laimg.moc>
Sun, 17 Nov 2019 00:26:30 +0000
(
00:26
+0000)
committer
Ivailo Monev
<xakepa10@laimg.moc>
Sun, 17 Nov 2019 00:26:30 +0000
(
00:26
+0000)
This reverts commit
545dc7141b4358d2195e50b077f5db7c722a1088
.
src/gui/kernel/qkeymapper_x11.cpp
patch
|
blob
|
history
diff --git
a/src/gui/kernel/qkeymapper_x11.cpp
b/src/gui/kernel/qkeymapper_x11.cpp
index
7f78d72
..
84a1663
100644
(file)
--- a/
src/gui/kernel/qkeymapper_x11.cpp
+++ b/
src/gui/kernel/qkeymapper_x11.cpp
@@
-51,6
+51,18
@@
#include <ctype.h>
+#ifdef QT_LINUXBASE
+// LSB's IsKeypadKey define is wrong - see
+// http://bugs.linuxbase.org/show_bug.cgi?id=2521
+#undef IsKeypadKey
+#define IsKeypadKey(keysym) \
+ (((KeySym)(keysym) >= XK_KP_Space) && ((KeySym)(keysym) <= XK_KP_Equal))
+
+#undef IsPrivateKeypadKey
+#define IsPrivateKeypadKey(keysym) \
+ (((KeySym)(keysym) >= 0x11000000) && ((KeySym)(keysym) <= 0x1100FFFF))
+#endif
+
QT_BEGIN_NAMESPACE
// from qapplication_x11.cpp