diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-29 16:20:02 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-29 16:20:29 +0100 |
| commit | 5715d858a0e38577a0ebcc4b972ca5cf70672935 (patch) | |
| tree | 0605c5f9da913db0fca13a719f0718fac4f1ee7e /src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationplugin.cpp | |
| parent | 934b4bb9a5d25f42d160b410b60de68d3ad8045b (diff) | |
| parent | d2e278e4e2a155a74ca6f3e072bc53eb05bda5f7 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
src/compositor/compositor_api/qwaylandsurface.cpp
Change-Id: I3ee40153c959dbe31ea685571c5a8bb1ae36606e
Diffstat (limited to 'src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationplugin.cpp')
0 files changed, 0 insertions, 0 deletions