diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-10-27 18:03:44 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-10-27 18:31:47 +0100 |
| commit | 8cac11fd8398b91300af6b40d16fcfebafade622 (patch) | |
| tree | 556717d1c8624fd691d52c441ff11bdda7cea731 /src/plugins/hardwareintegration | |
| parent | 699c44e3dc2d7099fdd87060c39309e318c55616 (diff) | |
| parent | f242587cbf3ee8ade683414aaa95158a1149db4c (diff) | |
Merge branch '5.6' into wip-compositor-api
qwindow-compositor changes from 5.6 will be adapted separately.
The traditional wayland-egl path is tested and is functional like before.
The EGLStream support will be verified separately once the qwindow-compositor
changes are ready.
Conflicts:
examples/wayland/qwindow-compositor/qwindowcompositor.cpp
examples/wayland/qwindow-compositor/textureblitter.cpp
examples/wayland/qwindow-compositor/textureblitter.h
examples/wayland/server-buffer/client/client.pro
examples/wayland/server-buffer/compositor/compositor.pro
src/compositor/compositor_api/qwaylandbufferref.cpp
src/compositor/compositor_api/qwaylandbufferref.h
src/compositor/hardware_integration/qwlclientbufferintegration_p.h
src/compositor/wayland_wrapper/qwlkeyboard.cpp
src/compositor/wayland_wrapper/qwlkeyboard_p.h
src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp
src/compositor/wayland_wrapper/qwlsurfacebuffer_p.h
src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp
src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h
src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro
Change-Id: Ic2e3a6e8f74606c35b1e27cd4016fa133527d7ba
Diffstat (limited to 'src/plugins/hardwareintegration')
| -rw-r--r-- | src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro b/src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro index 614c1cfef..5704663b0 100644 --- a/src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro +++ b/src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro @@ -1,7 +1,7 @@ PLUGIN_TYPE = wayland-graphics-integration-server load(qt_plugin) -QT = waylandcompositor waylandcompositor-private core-private gui-private +QT = waylandcompositor waylandcompositor-private core-private gui-private platformsupport-private OTHER_FILES += wayland-egl.json |