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

Change-Id: I67d0991de16ad1039848df5099db59ea6aa728f8

1 files changed, 9 insertions, 1 deletions

diff --git a/src/quicktemplates2/qquickpopup_p_p.h b/src/quicktemplates2/qquickpopup_p_p.h
index 09f28907..51e9cf2f 100644
--- a/src/quicktemplates2/qquickpopup_p_p.h
+++ b/src/quicktemplates2/qquickpopup_p_p.h
@@ -95,7 +95,14 @@ public:
 
     void init();
     void closeOrReject();
-    bool tryClose(QQuickItem *item, QMouseEvent *event);
+    bool tryClose(QQuickItem *item, QEvent *event);
+
+    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 void handleUngrab();
+
     virtual void reposition();
     virtual void resizeOverlay();
 
@@ -139,6 +146,7 @@ public:
     bool allowHorizontalResize;
     bool hadActiveFocusBeforeExitTransition;
     bool interactive;
+    int touchId;
     qreal x;
     qreal y;
     qreal effectiveX;