diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-05-14 21:06:48 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-05-14 21:06:48 +0200 |
| commit | 610712a6c9e5fad004c6325e2fd60a9c293b365c (patch) | |
| tree | ac12bb95075cfa302c72491846b4714a8ede4424 /src/hardwareintegration | |
| parent | 295e5a98385f250449a8833e643293ef9ec7d5b1 (diff) | |
| parent | 76eda41dab9ddccf4c2a38d981c9b03bc7f051d0 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ie2b6b40e3ad1e753f051a12c0296206cc884352b
Diffstat (limited to 'src/hardwareintegration')
| -rw-r--r-- | src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp | 7 | ||||
| -rw-r--r-- | src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h | 1 |
2 files changed, 0 insertions, 8 deletions
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp index e8d43fad4..7889f575f 100644 --- a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp +++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp @@ -162,13 +162,6 @@ QSurfaceFormat QWaylandEglWindow::format() const return m_format; } -void QWaylandEglWindow::setVisible(bool visible) -{ - QWaylandWindow::setVisible(visible); - if (!visible) - invalidateSurface(); -} - void QWaylandEglWindow::invalidateSurface() { if (m_eglSurface) { diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h index 878532afc..5b1f4d56f 100644 --- a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h +++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h @@ -75,7 +75,6 @@ public: void bindContentFBO(); void invalidateSurface() override; - void setVisible(bool visible) override; private: QWaylandEglClientBufferIntegration *m_clientBufferIntegration = nullptr; |