1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XCB/Xlib: make sure we don't get problems for sys headers using register

Browse Source 
Found while compiling on FreeBSD 11.2 (clang 6 update has the warning):

/usr/local/include/X11/Xlibint.h:675:7: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister]

Change-Id: I117816bf0f5e469b8d34fffd153e6482ccaed69f
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
This commit is contained in:
Thiago Macieira 2018-07-04 23:17:16 -07:00
parent abbd28f551
commit 89f7e090ef
7 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
View File

@ -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>

2
src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp
View File

@ -52,7 +52,9 @@
#include "qxcbglxnativeinterfacehandler.h"
#define register /* C++17 deprecated register */
#include <X11/Xlibint.h>
#undef register
QT_BEGIN_NAMESPACE

2
src/plugins/platforms/xcb/nativepainting/qbackingstore_x11.cpp
View File

@ -48,7 +48,9 @@
# include <X11/extensions/Xrender.h>
#endif
#define register /* C++17 deprecated register */
#include <X11/Xlib.h>
#undef register
#ifndef None
#define None 0L

2
src/plugins/platforms/xcb/nativepainting/qt_x11_p.h
View File

@ -40,8 +40,10 @@
#ifndef QT_X11_P_H
#define QT_X11_P_H
#define register /* C++17 deprecated register */
#include <X11/Xlib.h>
#include <X11/Xatom.h>
#undef register
#if QT_CONFIG(xrender)
# include "qtessellator_p.h"

2
src/plugins/platforms/xcb/qxcbconnection.cpp
View File

@ -73,10 +73,12 @@
#include <xcb/xinerama.h>
#if QT_CONFIG(xcb_xlib)
#define register /* C++17 deprecated register */
#include <X11/Xlib.h>
#include <X11/Xlib-xcb.h>
#include <X11/Xlibint.h>
#include <X11/Xutil.h>
#undef register
#endif
#if QT_CONFIG(xinput2)

2
src/plugins/platforms/xcb/qxcbintegration.cpp
View File

@ -66,7 +66,9 @@
#include <QtGui/private/qguiapplication_p.h>
#if QT_CONFIG(xcb_xlib)
#define register /* C++17 deprecated register */
#include <X11/Xlib.h>
#undef register
#if QT_CONFIG(xcb_native_painting)
#include "qxcbnativepainting.h"
#include "qpixmap_x11_p.h"

2
src/plugins/platforms/xcb/qxcbwindow.cpp
View File

@ -103,8 +103,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
#if QT_CONFIG(xinput2)