diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2018-09-07 12:21:15 +0200 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2018-09-10 08:01:55 +0000 |
| commit | 341f6fe0bea24d7942d1d3e2c445d6ec4c0cb35e (patch) | |
| tree | 63d6e2801217984232ad2029aff5d8d26da67e5c | |
| parent | 8b62fafcbe3ec5c1b50d9c3845b5ac961c9c3e87 (diff) | |
Prefix and suffix server buffer integrations
[ChangeLog][Compositor] Features for server buffer integrations have
been renamed. "drm-egl-server" is now "wayland-drm-egl-server-buffer"
and "libhybris-egl-server" is "wayland-libhybris-egl-server-buffer".
Change-Id: I06a9d1b1c9219c88045fe966be134ff072cd756e
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| -rw-r--r-- | src/client/configure.json | 8 | ||||
| -rw-r--r-- | src/compositor/configure.json | 4 | ||||
| -rw-r--r-- | src/plugins/hardwareintegration/client/client.pro | 4 | ||||
| -rw-r--r-- | src/plugins/hardwareintegration/compositor/compositor.pro | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/client/configure.json b/src/client/configure.json index b11416f68..02c36de10 100644 --- a/src/client/configure.json +++ b/src/client/configure.json @@ -101,12 +101,12 @@ "condition": "features.wayland-client && features.opengl && !features.opengles2 && features.xlib && libs.xcomposite && libs.glx", "output": [ "privateFeature" ] }, - "drm-egl-server": { + "wayland-drm-egl-server-buffer": { "label": "DRM EGL", "condition": "features.wayland-client && features.opengl && features.egl && tests.drm-egl-server", "output": [ "privateFeature" ] }, - "libhybris-egl-server": { + "wayland-libhybris-egl-server-buffer": { "label": "libhybris EGL", "condition": "features.wayland-client && features.opengl && features.egl && tests.libhybris-egl-server", "output": [ "privateFeature" ] @@ -130,8 +130,8 @@ "wayland-brcm", "xcomposite-egl", "xcomposite-glx", - "drm-egl-server", - "libhybris-egl-server" + "wayland-drm-egl-server-buffer", + "wayland-libhybris-egl-server-buffer" ] }, "wayland-client" diff --git a/src/compositor/configure.json b/src/compositor/configure.json index 21f486d78..20b0e9ce8 100644 --- a/src/compositor/configure.json +++ b/src/compositor/configure.json @@ -106,12 +106,12 @@ "condition": "features.wayland-server && features.opengl && !features.opengles2 && libs.xcomposite && libs.glx", "output": [ "privateFeature" ] }, - "drm-egl-server": { + "wayland-drm-egl-server-buffer": { "label": "DRM EGL", "condition": "features.wayland-server && features.opengl && features.egl && tests.drm-egl-server", "output": [ "privateFeature" ] }, - "libhybris-egl-server": { + "wayland-libhybris-egl-server-buffer": { "label": "libhybris EGL", "condition": "features.wayland-server && features.opengl && features.egl && tests.libhybris-egl-server", "output": [ "privateFeature" ] diff --git a/src/plugins/hardwareintegration/client/client.pro b/src/plugins/hardwareintegration/client/client.pro index f1c71f084..8001c9de6 100644 --- a/src/plugins/hardwareintegration/client/client.pro +++ b/src/plugins/hardwareintegration/client/client.pro @@ -9,9 +9,9 @@ qtConfig(xcomposite-egl): \ SUBDIRS += xcomposite-egl qtConfig(xcomposite-glx): \ SUBDIRS += xcomposite-glx -qtConfig(drm-egl-server): \ +qtConfig(wayland-drm-egl-server-buffer): \ SUBDIRS += drm-egl-server -qtConfig(libhybris-egl-server): \ +qtConfig(wayland-libhybris-egl-server-buffer): \ SUBDIRS += libhybris-egl-server ### TODO: make shm-emulation configurable diff --git a/src/plugins/hardwareintegration/compositor/compositor.pro b/src/plugins/hardwareintegration/compositor/compositor.pro index 22301d07e..ba216b334 100644 --- a/src/plugins/hardwareintegration/compositor/compositor.pro +++ b/src/plugins/hardwareintegration/compositor/compositor.pro @@ -9,9 +9,9 @@ qtConfig(xcomposite-egl): \ SUBDIRS += xcomposite-egl qtConfig(xcomposite-glx): \ SUBDIRS += xcomposite-glx -qtConfig(drm-egl-server): \ +qtConfig(wayland-drm-egl-server-buffer): \ SUBDIRS += drm-egl-server -qtConfig(libhybris-egl-server): \ +qtConfig(wayland-libhybris-egl-server-buffer): \ SUBDIRS += libhybris-egl-server ### TODO: make shm-emulation configurable |