AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure: add XCB GL integration features

Browse Source 
This way Qt builders can see if everything has been configured
properly for XCB GL integrations at configure time, instead of
at the end of the build process.

Change-Id: I00740cc2edd7f6ecfcda0ddfb22649d1b4db4aa2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
This commit is contained in:
Gatis Paeglis 2018-12-27 01:10:29 +01:00
parent 0decdcb754
commit dd988e2074
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/gui/configure.json
View File

@ -1531,12 +1531,24 @@
"emitIf": "features.xcb",
"output": [ { "type": "varAssign", "name": "QMAKE_X11_PREFIX", "value": "tests.x11prefix.value" } ]
},
"xcb-glx": {
"label": "XCB GLX",
"xcb-glx-plugin": {
"label": "GLX Plugin",
"emitIf": "features.xcb",
"condition": "features.xcb-xlib && features.opengl && !features.opengles2",
"output": [ "privateFeature" ]
},
"xcb-glx": {
"label": " XCB GLX",
"emitIf": "features.xcb && features.xcb-glx-plugin",
"condition": "libs.xcb_glx",
"output": [ "privateFeature" ]
},
"xcb-egl-plugin": {
"label": "EGL-X11 Plugin",
"emitIf": "features.xcb",
"condition": "features.egl_x11 && features.opengl",
"output": [ "privateFeature" ]
},
"xcb-native-painting": {
"label": "Native painting (experimental)",
"emitIf": "features.xcb",
@ -1941,7 +1953,15 @@ QMAKE_LIBDIR_OPENGL[_ES2] and QMAKE_LIBS_OPENGL[_ES2] in the mkspec for your pla
"section": "XCB",
"condition": "features.xcb",
"entries": [
"system-xcb", "xkb", "xcb-xinput", "xcb-glx", "xcb-native-painting"
"system-xcb", "xkb", "xcb-xinput", "xcb-native-painting",
{
"section": "GL integrations",
"entries": [
"xcb-glx-plugin",
"xcb-glx",
"xcb-egl-plugin"
]
}
]
},
{

4
src/plugins/platforms/xcb/gl_integrations/gl_integrations.pro
View File

@ -1,10 +1,10 @@
TEMPLATE = subdirs
QT_FOR_CONFIG += gui-private
qtConfig(egl):qtConfig(egl_x11):qtConfig(opengl) {
qtConfig(xcb-egl-plugin) {
SUBDIRS += xcb_egl
}
qtConfig(xcb-xlib):qtConfig(opengl):!qtConfig(opengles2) {
qtConfig(xcb-glx-plugin) {
SUBDIRS += xcb_glx
}