xcb: Use QT_CONFIG macro to check for xcb-xlib

... and remove the XCB_USE_XLIB define.

This patch also removes the unnecessary checks for xcb-xlib in:

- qxcbglxintegration.cpp as this files is build _only_ when
xcb-xlib is present. From gl_integrations.pro:

 qtConfig(xcb-xlib):qtConfig(opengl):!qtConfig(opengles2) {
    SUBDIRS += xcb_glx
 }

This also would have been the right place where to define
XCB_USE_XLIB, instead of unconditional line in xcb_glx.pro:

 DEFINES += XCB_USE_GLX XCB_USE_XLIB

- qxcbnativeinterface.cpp as this cpp file does not use any
Xlib APIs directly, there is no need to include Xlib.h.

Change-Id: I531b5f1e79606fcfd1c63810cf51b7d5e9dc58a7
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>

7 files changed, 7 insertions, 12 deletions

diff --git a/src/plugins/platforms/xcb/gl_integrations/gl_integrations_plugin_base.pri b/src/plugins/platforms/xcb/gl_integrations/gl_integrations_plugin_base.pri
index 4ab406acb9..063a74c395 100644
--- a/src/plugins/platforms/xcb/gl_integrations/gl_integrations_plugin_base.pri
+++ b/src/plugins/platforms/xcb/gl_integrations/gl_integrations_plugin_base.pri
@@ -7,7 +7,6 @@ load(qt_build_paths)
 
 # needed by Xcursor ...
 qtConfig(xcb-xlib) {
-    DEFINES += XCB_USE_XLIB
     qtConfig(xinput2) {
         DEFINES += XCB_USE_XINPUT2
     }
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglintegration.cpp
index 4852d38f7e..9c52733120 100644
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglintegration.cpp
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglintegration.cpp
@@ -116,7 +116,7 @@ QPlatformOffscreenSurface *QXcbEglIntegration::createPlatformOffscreenSurface(QO
 
 void *QXcbEglIntegration::xlib_display() const
 {
-#ifdef XCB_USE_XLIB
+#if QT_CONFIG(xcb_xlib)
     return m_connection->xlib_display();
 #else
     return EGL_DEFAULT_DISPLAY;
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglwindow.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglwindow.cpp
index 3f7ef94238..9c3fd26d49 100644
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglwindow.cpp
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglwindow.cpp
@@ -65,7 +65,7 @@ void QXcbEglWindow::resolveFormat(const QSurfaceFormat &format)
     m_format = q_glFormatFromConfig(m_glIntegration->eglDisplay(), m_config, format);
 }
 
-#ifdef XCB_USE_XLIB
+#if QT_CONFIG(xcb_xlib)
 const xcb_visualtype_t *QXcbEglWindow::createVisual()
 {
     QXcbScreen *scr = xcbScreen();
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglwindow.h b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglwindow.h
index 3090cef735..e49a3fe2ac 100644
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglwindow.h
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglwindow.h
@@ -62,7 +62,7 @@ protected:
     void create() override;
     void resolveFormat(const QSurfaceFormat &format) override;
 
-#ifdef XCB_USE_XLIB
+#if QT_CONFIG(xcb_xlib)
     const xcb_visualtype_t *createVisual() override;
 #endif
 
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/xcb_egl.pro b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/xcb_egl.pro
index 1c193849ca..a39e00ec59 100644
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/xcb_egl.pro
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/xcb_egl.pro
@@ -5,8 +5,6 @@ QT += egl_support-private
 
 CONFIG += egl
 
-qtConfig(xcb-xlib): DEFINES += XCB_USE_XLIB
-
 DEFINES += QT_NO_FOREACH
 
 HEADERS += \
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 77cbdd5fba..a283d451f8 100644
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp
@@ -75,7 +75,7 @@ typedef struct xcb_glx_buffer_swap_complete_event_t {
 } xcb_glx_buffer_swap_complete_event_t;
 #endif
 
-#if defined(XCB_USE_XLIB) && defined(XCB_USE_GLX)
+#if defined(XCB_USE_GLX)
 typedef struct {
     int type;
     unsigned long serial;       /* # of last request processed by server */
@@ -202,10 +202,9 @@ QPlatformOffscreenSurface *QXcbGlxIntegration::createPlatformOffscreenSurface(QO
     if (!vendorChecked) {
         vendorChecked = true;
         Display *display = glXGetCurrentDisplay();
-#ifdef XCB_USE_XLIB
         if (!display)
             display = static_cast<Display *>(m_connection->xlib_display());
-#endif
+
         const char *glxvendor = glXGetClientString(display, GLX_VENDOR);
         if (glxvendor) {
             if (!strcmp(glxvendor, "ATI") || !strcmp(glxvendor, "Chromium"))
@@ -231,10 +230,9 @@ bool QXcbGlxIntegration::supportsSwitchableWidgetComposition() const
     if (!vendorChecked) {
         vendorChecked = true;
         Display *display = glXGetCurrentDisplay();
-#ifdef XCB_USE_XLIB
         if (!display)
             display = static_cast<Display *>(m_connection->xlib_display());
-#endif
+
         const char *glxvendor = glXGetClientString(display, GLX_VENDOR);
         if (glxvendor) {
             if (!strcmp(glxvendor, "Parallels Inc"))
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/xcb_glx.pro b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/xcb_glx.pro
index 215f5a3fe1..5af6172301 100644
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/xcb_glx.pro
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/xcb_glx.pro
@@ -4,7 +4,7 @@ include(../gl_integrations_plugin_base.pri)
 QT += glx_support-private
 
 #should be removed from the sources
-DEFINES += XCB_USE_GLX XCB_USE_XLIB
+DEFINES += XCB_USE_GLX
 DEFINES += QT_NO_FOREACH
 
 qtConfig(xcb-glx) {