whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Oswald Buddenhagen 2016-08-16 08:57:03 +02:00 committed by Lars Knoll
parent 56ee007b3f
commit b786993f8d
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/platforms/xcb/gl_integrations/gl_integrations_plugin_base.pri
View File

@ -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
}

11
src/plugins/platforms/xcb/xcb_qpa_lib.pro
View File

@ -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
}