diff options
Diffstat (limited to 'src/plugins/platforms/xcb/gl_integrations')
-rw-r--r-- | src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp | 2 | ||||
-rw-r--r-- | src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp index cc982b3379..741885e321 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp @@ -45,8 +45,10 @@ #include "qxcbwindow.h" #include "qxcbscreen.h" +#define register /* C++17 deprecated register */ #include <X11/Xlib.h> #include <X11/Xutil.h> +#undef register #include <GL/glx.h> #include <QtGui/QOpenGLContext> diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp index 13f03f8bf3..a7641baea1 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp @@ -52,7 +52,9 @@ #include "qxcbglxnativeinterfacehandler.h" +#define register /* C++17 deprecated register */ #include <X11/Xlibint.h> +#undef register QT_BEGIN_NAMESPACE |