From b1381ea9ebb3dd4019081f4412f82a3280b4eb52 Mon Sep 17 00:00:00 2001
From: Alexander Volkov <a.volkov@rusbitech.ru>
Date: Wed, 22 Feb 2017 13:55:28 +0300
Subject: 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>
---
 src/plugins/platforms/xcb/qxcbnativeinterface.cpp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'src/plugins/platforms/xcb/qxcbnativeinterface.cpp')

diff --git a/src/plugins/platforms/xcb/qxcbnativeinterface.cpp b/src/plugins/platforms/xcb/qxcbnativeinterface.cpp
index 725288633a..97dcb8f328 100644
--- a/src/plugins/platforms/xcb/qxcbnativeinterface.cpp
+++ b/src/plugins/platforms/xcb/qxcbnativeinterface.cpp
@@ -57,11 +57,7 @@
 #include <QtPlatformHeaders/qxcbintegrationfunctions.h>
 #include <QtPlatformHeaders/qxcbscreenfunctions.h>
 
-#ifdef XCB_USE_XLIB
-#  include <X11/Xlib.h>
-#else
-#  include <stdio.h>
-#endif
+#include <stdio.h>
 
 #include <algorithm>
 
@@ -210,7 +206,7 @@ void *QXcbNativeInterface::nativeResourceForScreen(const QByteArray &resourceStr
     const QXcbScreen *xcbScreen = static_cast<QXcbScreen *>(screen->handle());
     switch (resourceType(lowerCaseResource)) {
     case Display:
-#ifdef XCB_USE_XLIB
+#if QT_CONFIG(xcb_xlib)
         result = xcbScreen->connection()->xlib_display();
 #endif
         break;
@@ -436,7 +432,7 @@ void *QXcbNativeInterface::rootWindow()
 
 void *QXcbNativeInterface::display()
 {
-#ifdef XCB_USE_XLIB
+#if QT_CONFIG(xcb_xlib)
     QXcbIntegration *integration = QXcbIntegration::instance();
     QXcbConnection *defaultConnection = integration->defaultConnection();
     if (defaultConnection)
@@ -514,7 +510,7 @@ QXcbScreen *QXcbNativeInterface::qPlatformScreenForWindow(QWindow *window)
 
 void *QXcbNativeInterface::displayForWindow(QWindow *window)
 {
-#if defined(XCB_USE_XLIB)
+#if QT_CONFIG(xcb_xlib)
     QXcbScreen *screen = qPlatformScreenForWindow(window);
     return screen ? screen->connection()->xlib_display() : Q_NULLPTR;
 #else
-- 
cgit v1.2.3