diff options
author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2018-09-05 15:09:14 +0200 |
---|---|---|
committer | Johan Helsing <johan.helsing@qt.io> | 2018-09-10 08:01:59 +0000 |
commit | 122123bfa4a65b04884f1d930900cb342fb7741c (patch) | |
tree | 5cb6f70da082e332517b3b7195fe371edb14e536 /src/plugins | |
parent | 341f6fe0bea24d7942d1d3e2c445d6ec4c0cb35e (diff) | |
download | qtwayland-122123bfa4a65b04884f1d930900cb342fb7741c.tar.gz |
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/plugins')
-rw-r--r-- | src/plugins/hardwareintegration/client/client.pro | 6 | ||||
-rw-r--r-- | src/plugins/hardwareintegration/compositor/compositor.pro | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/hardwareintegration/client/client.pro b/src/plugins/hardwareintegration/client/client.pro index 8001c9de..eab62f8d 100644 --- a/src/plugins/hardwareintegration/client/client.pro +++ b/src/plugins/hardwareintegration/client/client.pro @@ -9,10 +9,10 @@ qtConfig(xcomposite-egl): \ SUBDIRS += xcomposite-egl qtConfig(xcomposite-glx): \ SUBDIRS += xcomposite-glx + qtConfig(wayland-drm-egl-server-buffer): \ SUBDIRS += drm-egl-server qtConfig(wayland-libhybris-egl-server-buffer): \ SUBDIRS += libhybris-egl-server - -### TODO: make shm-emulation configurable -SUBDIRS += shm-emulation-server +qtConfig(wayland-shm-emulation-server-buffer): \ + SUBDIRS += shm-emulation-server diff --git a/src/plugins/hardwareintegration/compositor/compositor.pro b/src/plugins/hardwareintegration/compositor/compositor.pro index ba216b33..55bf1a7d 100644 --- a/src/plugins/hardwareintegration/compositor/compositor.pro +++ b/src/plugins/hardwareintegration/compositor/compositor.pro @@ -9,12 +9,12 @@ qtConfig(xcomposite-egl): \ SUBDIRS += xcomposite-egl qtConfig(xcomposite-glx): \ SUBDIRS += xcomposite-glx + qtConfig(wayland-drm-egl-server-buffer): \ SUBDIRS += drm-egl-server qtConfig(wayland-libhybris-egl-server-buffer): \ SUBDIRS += libhybris-egl-server - -### TODO: make shm-emulation configurable -SUBDIRS += shm-emulation-server +qtConfig(wayland-shm-emulation-server-buffer): \ + SUBDIRS += shm-emulation-server SUBDIRS += hardwarelayer |