diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2018-07-17 18:20:12 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-07-17 18:20:12 +0000 |
commit | cc5d8168001e652c045ff42685edf257ce00603c (patch) | |
tree | 6320f169d621bed128f08d92676035a8e2f2ab23 /src/plugins/platforms/xcb/qxcbwindow.cpp | |
parent | a9dfe71cca38e6b62445292ed2c6ec1c8224430a (diff) | |
parent | 1783fca89768a9d503d886673643dc4542ec467f (diff) |
Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbwindow.cpp')
-rw-r--r-- | src/plugins/platforms/xcb/qxcbwindow.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp index 316adb8fa9..9e9058e6e9 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.cpp +++ b/src/plugins/platforms/xcb/qxcbwindow.cpp @@ -106,8 +106,10 @@ #include <stdio.h> #if QT_CONFIG(xcb_xlib) +#define register /* C++17 deprecated register */ #include <X11/Xlib.h> #include <X11/Xutil.h> +#undef register #endif #define XCOORD_MAX 16383 |