1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create feature wayland-shm-emulation-server-buffer

Browse Source 
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>
This commit is contained in:
Johan Klokkhammer Helsing 2018-09-05 15:09:14 +02:00 committed by Johan Helsing
parent 108bd7ca26
commit a9f0ac5e33
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/platforms/wayland/configure.json
View File

@ -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"

6
src/plugins/platforms/wayland/plugins/hardwareintegration/client.pro
View File

@ -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