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

Change-Id: I47fbec425594386f529623f2dcbddd7ec7a09ee7

1 files changed, 7 insertions, 3 deletions

diff --git a/src/quicktemplates2/qquickoverlay_p_p.h b/src/quicktemplates2/qquickoverlay_p_p.h
index c9d887bd..de8539c9 100644
--- a/src/quicktemplates2/qquickoverlay_p_p.h
+++ b/src/quicktemplates2/qquickoverlay_p_p.h
@@ -70,9 +70,13 @@ public:
         return overlay->d_func();
     }
 
-    void handlePress(QEvent *event);
-    void handleMove(QEvent *event);
-    void handleRelease(QEvent *event);
+    bool startDrag(QEvent *event);
+    bool handlePress(QQuickItem *source, QEvent *event, QQuickPopup *target);
+    bool handleMove(QQuickItem *source, QEvent *event, QQuickPopup *target);
+    bool handleRelease(QQuickItem *source, QEvent *event, QQuickPopup *target);
+
+    bool handleMouseEvent(QQuickItem *source, QMouseEvent *event, QQuickPopup *target = nullptr);
+    bool handleTouchEvent(QQuickItem *source, QTouchEvent *event, QQuickPopup *target = nullptr);
 
     void addPopup(QQuickPopup *popup);
     void removePopup(QQuickPopup *popup);