diff options
| author | Jani Heikkinen <jani.heikkinen@qt.io> | 2020-03-24 06:17:57 +0000 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2020-03-24 19:30:17 +0200 |
| commit | af3976e5e788392ab2b0299c11036c18493d8d40 (patch) | |
| tree | 7d2e032f6ef8062fd619da5da1d44afa215b14f9 /src/hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamintegration.h | |
| parent | 3e79280ad234ad01c126f84ecfa1596fa12628a0 (diff) | |
Revert "Compositor: Warn and clean up when client hardware buffer integrations fail"v5.14.2
This reverts commit 137966a6293b50f6b248d130a2e36e67df49335e.
Reason for revert: QTBUG-82948
Conflicts:
src/compositor/compositor_api/qwaylandcompositor.cpp
src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp
Change-Id: I77e3265c336fbcdf47eb1aa5dc07f31ec41006b5
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamintegration.h')
| -rw-r--r-- | src/hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamintegration.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamintegration.h b/src/hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamintegration.h index 35d2c80d3..4c4cce257 100644 --- a/src/hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamintegration.h +++ b/src/hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamintegration.h @@ -44,7 +44,7 @@ public: WaylandEglStreamClientBufferIntegration(); ~WaylandEglStreamClientBufferIntegration() override; - bool initializeHardware(struct ::wl_display *display) override; + void initializeHardware(struct ::wl_display *display) override; QtWayland::ClientBuffer *createBufferFor(wl_resource *buffer) override; |