summaryrefslogtreecommitdiffstats
path: root/src/client/configure.json
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2018-09-05 15:09:14 +0200
committerJohan Helsing <johan.helsing@qt.io>2018-09-10 08:01:59 +0000
commit122123bfa4a65b04884f1d930900cb342fb7741c (patch)
tree5cb6f70da082e332517b3b7195fe371edb14e536 /src/client/configure.json
parent341f6fe0bea24d7942d1d3e2c445d6ec4c0cb35e (diff)
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 <paul.tvete@qt.io>
Diffstat (limited to 'src/client/configure.json')
-rw-r--r--src/client/configure.json8
1 files changed, 7 insertions, 1 deletions
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"