summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2018-01-08 11:07:59 +0100
committerUlf Hermann <ulf.hermann@qt.io>2018-01-08 11:43:11 +0000
commit8e72f51257c16478f9e360fc798de8eacbf94fee (patch)
treed4fa9daf1ae451e19ab290b46da8c952008d6e4a /src/plugins
parent69496d4e22fb6a8805fbcfa798d9aca53621a2ac (diff)
XCB: Undef KeyPress and KeyRelease also when not using xinput2
The defines come from X.h here, which is included via Xutil.h. Change-Id: I19887424cff28567fcbb1c352b42bb9d750b1928 Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/platforms/xcb/qxcbkeyboard.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/qxcbkeyboard.cpp b/src/plugins/platforms/xcb/qxcbkeyboard.cpp
index 9aedee109f..136faec855 100644
--- a/src/plugins/platforms/xcb/qxcbkeyboard.cpp
+++ b/src/plugins/platforms/xcb/qxcbkeyboard.cpp
@@ -61,6 +61,8 @@
#if QT_CONFIG(xcb_xlib)
#include <X11/Xutil.h>
+#undef KeyPress
+#undef KeyRelease
#endif
#ifndef XK_ISO_Left_Tab