Merge remote-tracking branch 'origin/dev' into wip/cmake

Removed dependencies.yaml because we don't use it yet in wip/cmake.
Fixed conflict in qmlcachegen.cpp.

Change-Id: Ie1060c737bee1daa85779903598e5b6d5020d922

1 files changed, 10 insertions, 0 deletions

diff --git a/src/quick/handlers/qquickpointerhandler_p.h b/src/quick/handlers/qquickpointerhandler_p.h
index c600e42491..34ae9ce2c2 100644
--- a/src/quick/handlers/qquickpointerhandler_p.h
+++ b/src/quick/handlers/qquickpointerhandler_p.h
@@ -71,6 +71,11 @@ class Q_QUICK_PRIVATE_EXPORT QQuickPointerHandler : public QObject, public QQmlP
     Q_PROPERTY(QQuickItem * parent READ parentItem CONSTANT)
     Q_PROPERTY(GrabPermissions grabPermissions READ grabPermissions WRITE setGrabPermissions NOTIFY grabPermissionChanged)
     Q_PROPERTY(qreal margin READ margin WRITE setMargin NOTIFY marginChanged)
+    Q_PROPERTY(int dragThreshold READ dragThreshold WRITE setDragThreshold RESET resetDragThreshold NOTIFY dragThresholdChanged REVISION 15)
+
+    QML_NAMED_ELEMENT(PointerHandler)
+    QML_UNCREATABLE("PointerHandler is an abstract base class.")
+    QML_ADDED_IN_MINOR_VERSION(12)
 
 public:
     explicit QQuickPointerHandler(QQuickItem *parent = nullptr);
@@ -110,11 +115,16 @@ public:
     qreal margin() const;
     void setMargin(qreal pointDistanceThreshold);
 
+    int dragThreshold() const;
+    void setDragThreshold(int t);
+    void resetDragThreshold();
+
 Q_SIGNALS:
     void enabledChanged();
     void activeChanged();
     void targetChanged();
     void marginChanged();
+    Q_REVISION(15) void dragThresholdChanged();
     void grabChanged(QQuickEventPoint::GrabTransition transition, QQuickEventPoint *point);
     void grabPermissionChanged();
     void canceled(QQuickEventPoint *point);