Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: I3bbf053a35ceee52d9953a676bacec2b9299bad5

1 files changed, 6 insertions, 2 deletions

diff --git a/src/compositor/extensions/qwaylandwlshellintegration_p.h b/src/compositor/extensions/qwaylandwlshellintegration_p.h
index 8af54dfc4..eb23a62fc 100644
--- a/src/compositor/extensions/qwaylandwlshellintegration_p.h
+++ b/src/compositor/extensions/qwaylandwlshellintegration_p.h
@@ -65,8 +65,9 @@ class WlShellIntegration : public QWaylandQuickShellIntegration
 public:
     WlShellIntegration(QWaylandQuickShellSurfaceItem *item);
     ~WlShellIntegration() override;
-    bool mouseMoveEvent(QMouseEvent *event) override;
-    bool mouseReleaseEvent(QMouseEvent *event) override;
+
+protected:
+    bool eventFilter(QObject *object, QEvent *event) override;
 
 private Q_SLOTS:
     void handleStartMove(QWaylandSeat *seat);
@@ -130,6 +131,9 @@ private:
 
     QPointF normalPosition;
     QPointF finalPosition;
+
+    bool filterMouseMoveEvent(QMouseEvent *event);
+    bool filterMouseReleaseEvent(QMouseEvent *event);
 };
 
 }