From fab564c40b9a53c39844cd60976f8e247e3a7b8b Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Tue, 24 Sep 2019 13:36:38 +0200 Subject: [PATCH] Configure: Remove libs.glx 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 --- src/plugins/platforms/wayland/configure.json | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/plugins/platforms/wayland/configure.json b/src/plugins/platforms/wayland/configure.json index 403a2edcf13..99cdc43047e 100644 --- a/src/plugins/platforms/wayland/configure.json +++ b/src/plugins/platforms/wayland/configure.json @@ -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": {