diff options
Diffstat (limited to 'src/plugins/platforms')
-rw-r--r-- | src/plugins/platforms/xcb/gl_integrations/gl_integrations_plugin_base.pri | 9 | ||||
-rw-r--r-- | src/plugins/platforms/xcb/xcb_qpa_lib.pro | 11 |
2 files changed, 9 insertions, 11 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 8d34e98940..e97f24e974 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 @@ -11,11 +11,6 @@ contains(QT_CONFIG, xcb-xlib) { } } -# to support custom cursors with depth > 1 -contains(QT_CONFIG, xcb-render) { - DEFINES += XCB_USE_RENDER -} - # build with session management support contains(QT_CONFIG, xcb-sm) { DEFINES += XCB_USE_SM @@ -31,5 +26,9 @@ contains(QT_CONFIG, xcb-qt) { QMAKE_USE += xcb } else { qtConfig(xkb): QMAKE_USE += xcb_xkb + # to support custom cursors with depth > 1 + contains(QT_CONFIG, xcb-render) { + DEFINES += XCB_USE_RENDER + } QMAKE_USE += xcb_syslibs } diff --git a/src/plugins/platforms/xcb/xcb_qpa_lib.pro b/src/plugins/platforms/xcb/xcb_qpa_lib.pro index 326aa356df..c496fb7452 100644 --- a/src/plugins/platforms/xcb/xcb_qpa_lib.pro +++ b/src/plugins/platforms/xcb/xcb_qpa_lib.pro @@ -51,12 +51,6 @@ contains(QT_CONFIG, xcb-xlib) { } } -# to support custom cursors with depth > 1 -contains(QT_CONFIG, xcb-render) { - DEFINES += XCB_USE_RENDER - QMAKE_USE += xcb_render -} - # build with session management support contains(QT_CONFIG, xcb-sm) { DEFINES += XCB_USE_SM @@ -82,6 +76,11 @@ contains(QT_CONFIG, xcb-qt) { } else { LIBS += -lxcb-xinerama ### there is no configure test for this! qtConfig(xkb): QMAKE_USE += xcb_xkb + # to support custom cursors with depth > 1 + contains(QT_CONFIG, xcb-render) { + DEFINES += XCB_USE_RENDER + QMAKE_USE += xcb_render + } QMAKE_USE += xcb_syslibs } |