diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-09-24 13:36:38 +0200 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2019-09-25 11:38:56 +0000 |
| commit | 6ebd2658be0b44478495ee1353b389c5a6f18e6a (patch) | |
| tree | f1a278259efb942e773dd53bb270cd8a22981f73 | |
| parent | bf35b2cb11136a4bdc59e52ef1aafb2cb48d8e3c (diff) | |
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 <simon.hausmann@qt.io>
| -rw-r--r-- | src/client/configure.json | 10 | ||||
| -rw-r--r-- | src/compositor/configure.json | 9 | ||||
| -rw-r--r-- | src/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pri | 2 | ||||
| -rw-r--r-- | src/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pri | 2 |
4 files changed, 4 insertions, 19 deletions
diff --git a/src/client/configure.json b/src/client/configure.json index 403a2edcf..99cdc4304 100644 --- a/src/client/configure.json +++ b/src/client/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": { diff --git a/src/compositor/configure.json b/src/compositor/configure.json index db80543f7..b0ac9f264 100644 --- a/src/compositor/configure.json +++ b/src/compositor/configure.json @@ -49,13 +49,6 @@ { "type": "pkgConfig", "args": "xcomposite" }, "-lxcomposite" ] - }, - "glx": { - "test": "glx", - "sources": [ - { "type": "pkgConfig", "args": "x11 gl" }, - "-lX11 -lGl" - ] } }, @@ -121,7 +114,7 @@ }, "xcomposite-glx": { "label": "XComposite EGL", - "condition": "features.wayland-server && features.opengl && !features.opengles2 && libs.xcomposite && libs.glx", + "condition": "features.wayland-server && features.opengl && !features.opengles2 && features.xlib && libs.xcomposite", "output": [ "privateFeature" ] }, "wayland-drm-egl-server-buffer": { diff --git a/src/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pri b/src/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pri index a2f5376a9..72897d151 100644 --- a/src/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pri +++ b/src/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pri @@ -1,7 +1,7 @@ INCLUDEPATH += $$PWD include ($$PWD/../xcomposite_share/xcomposite_share.pri) -QMAKE_USE += wayland-client glx libdl +QMAKE_USE += wayland-client libdl QT += glx_support-private diff --git a/src/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pri b/src/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pri index 423ae1815..0de392022 100644 --- a/src/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pri +++ b/src/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pri @@ -1,6 +1,6 @@ include($$PWD/../xcomposite_share/xcomposite_share.pri) -QMAKE_USE_PRIVATE += wayland-server glx +QMAKE_USE_PRIVATE += wayland-server INCLUDEPATH += $$PWD |