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

Change-Id: I47fbec425594386f529623f2dcbddd7ec7a09ee7

1 files changed, 6 insertions, 5 deletions

diff --git a/src/quicktemplates2/qquickdrawer_p_p.h b/src/quicktemplates2/qquickdrawer_p_p.h
index c2c5beaf..dba3032e 100644
--- a/src/quicktemplates2/qquickdrawer_p_p.h
+++ b/src/quicktemplates2/qquickdrawer_p_p.h
@@ -71,12 +71,13 @@ public:
     void resizeOverlay() override;
 
     bool startDrag(QEvent *event);
-    bool grabMouse(QMouseEvent *event);
-    bool ungrabMouse(QMouseEvent *event);
+    bool grabMouse(QQuickItem *item, QMouseEvent *event);
+    bool grabTouch(QQuickItem *item, QTouchEvent *event);
 
-    bool handleMousePressEvent(QQuickItem *item, QMouseEvent *event);
-    bool handleMouseMoveEvent(QQuickItem *item, QMouseEvent *event);
-    bool handleMouseReleaseEvent(QQuickItem *item, QMouseEvent *event);
+    bool handlePress(QQuickItem* item, const QPointF &point, ulong timestamp) override;
+    bool handleMove(QQuickItem* item, const QPointF &point, ulong timestamp) override;
+    bool handleRelease(QQuickItem* item, const QPointF &point, ulong timestamp) override;
+    void handleUngrab() override;
 
     bool prepareEnterTransition() override;
     bool prepareExitTransition() override;