1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Configure: Remove libs.glx

Browse Source 
libs.glx just checks if we can can link against x11 and gl, this should already
be covered by features.xlib and features.opengl.

Also, it probably makes sense to not build these plugins if Qt is configured
with no-feature-xlib.

Task-number: QTBUG-78177
Change-Id: I56ccdc80a4601ccbf03cc5e65abe0adb3a579f99
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Johan Klokkhammer Helsing 2019-09-24 13:36:38 +02:00 committed by Johan Helsing
parent 95ce296968
commit fab564c40b
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/platforms/wayland/configure.json
View File

@ -40,14 +40,6 @@
{ "type": "pkgConfig", "args": "xcomposite" },
"-lxcomposite"
]
},
"glx": {
"label": "GLX",
"test": "glx",
"sources": [
{ "type": "pkgConfig", "args": "x11 gl" },
"-lX11 -lGl"
]
}
},
@ -145,7 +137,7 @@
},
"xcomposite-glx": {
"label": "XComposite GLX",
"condition": "features.wayland-client && features.opengl && !features.opengles2 && features.xlib && libs.xcomposite && libs.glx",
"condition": "features.wayland-client && features.opengl && !features.opengles2 && features.xlib && libs.xcomposite",
"output": [ "privateFeature" ]
},
"wayland-drm-egl-server-buffer": {