From b786993f8da01c9432d2736f565d3c7e8f2ab122 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 16 Aug 2016 08:57:03 +0200 Subject: fix xcb-render nesting xcb-render is emitIf on xcb-syslibs, so it needs to move into the respective branches in the project files. Change-Id: Iaa6db9012287ae0e9c363ca5eeec48daad862320 Reviewed-by: Lars Knoll --- src/plugins/platforms/xcb/xcb_qpa_lib.pro | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/plugins/platforms/xcb/xcb_qpa_lib.pro') 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 } -- cgit v1.2.3