diff options
| author | Alexander Volkov <a.volkov@rusbitech.ru> | 2017-02-22 14:33:56 +0300 |
|---|---|---|
| committer | Gatis Paeglis <gatis.paeglis@qt.io> | 2017-07-03 11:40:35 +0000 |
| commit | 46312b611b4aa04d32eab05668d84f09e6aa6670 (patch) | |
| tree | 382c92a2ae4958ece7221ce9c82726be4dd88130 /src/plugins/platforms/xcb/qxcbconnection.cpp | |
| parent | 5ac03a14bfeab468e4d1676d31c611d8c03b1129 (diff) | |
xcb: Use QT_CONFIG macro to check for xcb-sm, xcb-render, and xcb-glx
And remove the corresponding defines.
Note that XCB_USE_GLX and XCB_HAS_XCB_GLX were used as synonyms
because QGLXBufferSwapComplete was wrapped in #if defined(XCB_USE_GLX)
and at the same time it was used only when XCB_HAS_XCB_GLX
was defined.
Change-Id: I6c04b0ccfd5369b78b3e8af2ec39d38ae5c311dc
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbconnection.cpp')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbconnection.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp index cd170e3dbc..e167ba1231 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection.cpp @@ -80,7 +80,7 @@ #include <X11/extensions/XI2proto.h> #endif -#ifdef XCB_USE_RENDER +#if QT_CONFIG(xcb_render) #include <xcb/render.h> #endif @@ -583,7 +583,7 @@ QXcbConnection::QXcbConnection(QXcbNativeInterface *nativeInterface, bool canGra #if QT_CONFIG(xkb) &xcb_xkb_id, #endif -#ifdef XCB_USE_RENDER +#if QT_CONFIG(xcb_render) &xcb_render_id, #endif 0 @@ -1533,7 +1533,7 @@ xcb_window_t QXcbConnection::clientLeader() 1, &m_clientLeader)); -#if !defined(QT_NO_SESSIONMANAGER) && defined(XCB_USE_SM) +#if QT_CONFIG(xcb_sm) // If we are session managed, inform the window manager about it QByteArray session = qGuiApp->sessionId().toLatin1(); if (!session.isEmpty()) { @@ -2067,7 +2067,7 @@ void QXcbConnection::initializeXFixes() void QXcbConnection::initializeXRender() { -#ifdef XCB_USE_RENDER +#if QT_CONFIG(xcb_render) const xcb_query_extension_reply_t *reply = xcb_get_extension_data(m_connection, &xcb_render_id); if (!reply || !reply->present) return; |