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/gl_integrations/xcb_glx/xcb_glx.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/gl_integrations/xcb_glx/xcb_glx.pro')
| -rw-r--r-- | src/plugins/platforms/xcb/gl_integrations/xcb_glx/xcb_glx.pro | 7 |
1 files changed, 1 insertions, 6 deletions
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 5af6172301..9d537b18f3 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 @@ -3,14 +3,9 @@ TARGET = qxcb-glx-integration include(../gl_integrations_plugin_base.pri) QT += glx_support-private -#should be removed from the sources -DEFINES += XCB_USE_GLX DEFINES += QT_NO_FOREACH -qtConfig(xcb-glx) { - DEFINES += XCB_HAS_XCB_GLX - QMAKE_USE += xcb_glx -} +qtConfig(xcb-glx): QMAKE_USE += xcb_glx !static:qtConfig(dlopen): QMAKE_USE += libdl |