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/xcb_qpa_lib.pro | |
| 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/xcb_qpa_lib.pro')
| -rw-r--r-- | src/plugins/platforms/xcb/xcb_qpa_lib.pro | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/plugins/platforms/xcb/xcb_qpa_lib.pro b/src/plugins/platforms/xcb/xcb_qpa_lib.pro index d0dc8f3075..1c76b49650 100644 --- a/src/plugins/platforms/xcb/xcb_qpa_lib.pro +++ b/src/plugins/platforms/xcb/xcb_qpa_lib.pro @@ -58,9 +58,7 @@ qtConfig(xcb-xlib) { } } -# build with session management support qtConfig(xcb-sm) { - DEFINES += XCB_USE_SM QMAKE_USE += x11sm SOURCES += qxcbsessionmanager.cpp HEADERS += qxcbsessionmanager.h @@ -69,16 +67,11 @@ qtConfig(xcb-sm) { include(gl_integrations/gl_integrations.pri) !qtConfig(system-xcb) { - DEFINES += XCB_USE_RENDER QMAKE_USE += xcb-static xcb } else { LIBS += -lxcb-xinerama ### there is no configure test for this! qtConfig(xkb): QMAKE_USE += xcb_xkb - # to support custom cursors with depth > 1 - qtConfig(xcb-render) { - DEFINES += XCB_USE_RENDER - QMAKE_USE += xcb_render - } + qtConfig(xcb-render): QMAKE_USE += xcb_render QMAKE_USE += xcb_syslibs } |