summaryrefslogtreecommitdiffstats
path: root/src/client
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-09-25 03:00:56 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-09-25 03:00:56 +0200
commit0fbc2f68c87e0057ed7df3ad500c7dfe5c61d9d8 (patch)
treec8cc693badfce0fdabfec8feb328d8251615820c /src/client
parentaede513e7c592dd189754898a38d1aac432d55ed (diff)
parent582af70640e411d8f423f1bc0528d5a5fce08e3a (diff)
Merge remote-tracking branch 'origin/5.12' into dev
Diffstat (limited to 'src/client')
-rw-r--r--src/client/configure.json11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/client/configure.json b/src/client/configure.json
index e5a0e5c7f..518514011 100644
--- a/src/client/configure.json
+++ b/src/client/configure.json
@@ -68,6 +68,12 @@
"type": "compile",
"test": "libhybris_egl_server",
"use": "egl"
+ },
+ "dmabuf-server-buffer": {
+ "label": "Linux dma-buf Buffer Sharing",
+ "type": "compile",
+ "test": "dmabuf_server_buffer",
+ "use": "egl"
}
},
@@ -136,6 +142,11 @@
"condition": "features.wayland-client && features.opengl && features.egl && tests.libhybris-egl-server",
"output": [ "privateFeature" ]
},
+ "wayland-dmabuf-server-buffer": {
+ "label": "Linux dma-buf server buffer integration",
+ "condition": "features.wayland-client && features.opengl && features.egl && tests.dmabuf-server-buffer",
+ "output": [ "privateFeature" ]
+ },
"wayland-shm-emulation-server-buffer": {
"label": "Shm emulation server buffer integration",
"condition": "features.wayland-client && features.opengl",