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

Change-Id: I931a7b264c68c40e16d9467b48173311aef74bd0

1 files changed, 1 insertions, 18 deletions

diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h
index ab704b9adf..ef42a4bf72 100644
--- a/src/quick/items/qquickwindow_p.h
+++ b/src/quick/items/qquickwindow_p.h
@@ -141,6 +141,7 @@ public:
     bool translateTouchToMouse(QQuickItem *item, QTouchEvent *event);
     void translateTouchEvent(QTouchEvent *touchEvent);
     void setMouseGrabber(QQuickItem *grabber);
+    void grabTouchPoints(QQuickItem *grabber, const QVector<int> &ids);
     void removeGrabber(QQuickItem *grabber, bool mouse = true, bool touch = true);
     static void transformTouchPoints(QList<QTouchEvent::TouchPoint> &touchPoints, const QTransform &transform);
     static QMouseEvent *cloneMouseEvent(QMouseEvent *event, QPointF *transformedLocalPos = 0);
@@ -310,22 +311,6 @@ private:
     static void cleanupNodesOnShutdown(QQuickItem *);
 };
 
-class Q_QUICK_PRIVATE_EXPORT QQuickCloseEvent : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(bool accepted READ isAccepted WRITE setAccepted)
-
-public:
-    QQuickCloseEvent()
-        : _accepted(true) {}
-
-    bool isAccepted() { return _accepted; }
-    void setAccepted(bool accepted) { _accepted = accepted; }
-
-private:
-    bool _accepted;
-};
-
 class QQuickWindowQObjectCleanupJob : public QRunnable
 {
 public:
@@ -343,6 +328,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickWindowPrivate::FocusOptions)
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QQuickCloseEvent)
-
 #endif // QQUICKWINDOW_P_H