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

Change-Id: I47fbec425594386f529623f2dcbddd7ec7a09ee7

1 files changed, 9 insertions, 4 deletions

diff --git a/src/quicktemplates2/qquickpopup_p_p.h b/src/quicktemplates2/qquickpopup_p_p.h
index 51e9cf2f..476e691d 100644
--- a/src/quicktemplates2/qquickpopup_p_p.h
+++ b/src/quicktemplates2/qquickpopup_p_p.h
@@ -95,14 +95,19 @@ public:
 
     void init();
     void closeOrReject();
-    bool tryClose(QQuickItem *item, QEvent *event);
+    bool tryClose(const QPointF &pos, QQuickPopup::ClosePolicy flags);
 
     virtual bool acceptTouch(const QTouchEvent::TouchPoint &point);
-    virtual void handlePress(const QPointF &point);
-    virtual void handleMove(const QPointF &point);
-    virtual void handleRelease(const QPointF &point);
+    virtual bool blockInput(QQuickItem *item, const QPointF &point) const;
+
+    virtual bool handlePress(QQuickItem* item, const QPointF &point, ulong timestamp);
+    virtual bool handleMove(QQuickItem* item, const QPointF &point, ulong timestamp);
+    virtual bool handleRelease(QQuickItem* item, const QPointF &point, ulong timestamp);
     virtual void handleUngrab();
 
+    bool handleMouseEvent(QQuickItem *item, QMouseEvent *event);
+    bool handleTouchEvent(QQuickItem *item, QTouchEvent *event);
+
     virtual void reposition();
     virtual void resizeOverlay();