diff options
author | Paul Olav Tvete <paul.tvete@qt.io> | 2021-05-14 10:35:53 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-05-14 17:46:39 +0000 |
commit | 65e8b69228ea5d72a923a98385b7814555225eba (patch) | |
tree | d4b1843db603aa7750b3970395fa3ab17637b805 | |
parent | 5289504ea3985aba248cc47b4543301978cd229a (diff) | |
download | qtwayland-65e8b69228ea5d72a923a98385b7814555225eba.tar.gz |
Don't use deprecated API
QExposeEvent::region() is deprecated.
Fixes: QTBUG-93751
Change-Id: Idaff6fdc4c88e70696ba0074e26db3505c48b9d0
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: David Edmundson <davidedmundson@kde.org>
(cherry picked from commit 6aab3cbba0f9df3141cafd571f621610c94eaf1c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | examples/wayland/custom-extension/client-common/customextension.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/examples/wayland/custom-extension/client-common/customextension.cpp b/examples/wayland/custom-extension/client-common/customextension.cpp index 8b77c061..d7ef3f04 100644 --- a/examples/wayland/custom-extension/client-common/customextension.cpp +++ b/examples/wayland/custom-extension/client-common/customextension.cpp @@ -82,14 +82,12 @@ QWindow *CustomExtension::windowForSurface(struct ::wl_surface *surface) bool CustomExtension::eventFilter(QObject *object, QEvent *event) { if (event->type() == QEvent::Expose) { - auto *exposeEvent = static_cast<QExposeEvent *>(event); - if (exposeEvent->region().isNull()) - return false; - QWindow *window = qobject_cast<QWindow*>(object); Q_ASSERT(window); - window->removeEventFilter(this); - QtWayland::qt_example_extension::register_surface(getWlSurface(window)); + if (window->isExposed()) { + window->removeEventFilter(this); + QtWayland::qt_example_extension::register_surface(getWlSurface(window)); + } } return false; } |