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

Change-Id: I77d6c2fdf916d909cde0e9a830414571f59781a7

1 files changed, 3 insertions, 0 deletions

diff --git a/src/quicktemplates2/qquickpopup_p_p.h b/src/quicktemplates2/qquickpopup_p_p.h
index 476e691d..fa79003e 100644
--- a/src/quicktemplates2/qquickpopup_p_p.h
+++ b/src/quicktemplates2/qquickpopup_p_p.h
@@ -97,6 +97,8 @@ public:
     void closeOrReject();
     bool tryClose(const QPointF &pos, QQuickPopup::ClosePolicy flags);
 
+    bool contains(const QPointF &scenePos) const;
+
     virtual bool acceptTouch(const QTouchEvent::TouchPoint &point);
     virtual bool blockInput(QQuickItem *item, const QPointF &point) const;
 
@@ -163,6 +165,7 @@ public:
     qreal bottomMargin;
     qreal contentWidth;
     qreal contentHeight;
+    QPointF pressPoint;
     TransitionState transitionState;
     QQuickPopup::ClosePolicy closePolicy;
     QQuickItem *parentItem;