diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-16 08:57:03 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-08-19 04:27:44 +0000 |
| commit | b786993f8da01c9432d2736f565d3c7e8f2ab122 (patch) | |
| tree | 4eb12688218a38bfa41af5900237d2717b4c5633 /src/plugins/platforms/xcb/xcb_qpa_lib.pro | |
| parent | 56ee007b3f44eb3276b244a630f55482c2b02228 (diff) | |
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 <lars.knoll@qt.io>
Diffstat (limited to 'src/plugins/platforms/xcb/xcb_qpa_lib.pro')
| -rw-r--r-- | src/plugins/platforms/xcb/xcb_qpa_lib.pro | 11 |
1 files changed, 5 insertions, 6 deletions
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 } |