From 122123bfa4a65b04884f1d930900cb342fb7741c Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Wed, 5 Sep 2018 15:09:14 +0200 Subject: Create feature wayland-shm-emulation-server-buffer And make OpenGL a requirement, in order to make builds without OpenGL work again. Fixes: QTBUG-69779 Change-Id: Iff1153b0aaca8e115f47c59c2ceb028e638e3fe9 Reviewed-by: Paul Olav Tvete --- src/client/configure.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/client/configure.json') diff --git a/src/client/configure.json b/src/client/configure.json index 02c36de10..ef5e87bb7 100644 --- a/src/client/configure.json +++ b/src/client/configure.json @@ -110,6 +110,11 @@ "label": "libhybris EGL", "condition": "features.wayland-client && features.opengl && features.egl && tests.libhybris-egl-server", "output": [ "privateFeature" ] + }, + "wayland-shm-emulation-server-buffer": { + "label": "Shm emulation server buffer integration", + "condition": "features.wayland-client && features.opengl", + "output": [ "privateFeature" ] } }, @@ -131,7 +136,8 @@ "xcomposite-egl", "xcomposite-glx", "wayland-drm-egl-server-buffer", - "wayland-libhybris-egl-server-buffer" + "wayland-libhybris-egl-server-buffer", + "wayland-shm-emulation-server-buffer" ] }, "wayland-client" -- cgit v1.2.3