Add autotest for DragHandler

Change-Id: I46f7e2c16b775723a08aa192845d490046231990
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>

9 files changed, 964 insertions, 0 deletions

diff --git a/tests/auto/quick/pointerhandlers/pointerhandlers.pro b/tests/auto/quick/pointerhandlers/pointerhandlers.pro
index 13a4b81f4e..2492924944 100644
--- a/tests/auto/quick/pointerhandlers/pointerhandlers.pro
+++ b/tests/auto/quick/pointerhandlers/pointerhandlers.pro
@@ -5,6 +5,7 @@ qtConfig(private_tests) {
         flickableinterop \
         multipointtoucharea_interop \
         qquickpointerhandler \
+        qquickdraghandler \
         qquicktaphandler \
 }
 
diff --git a/tests/auto/quick/pointerhandlers/qquickdraghandler/data/DragAnywhereSlider.qml b/tests/auto/quick/pointerhandlers/qquickdraghandler/data/DragAnywhereSlider.qml
new file mode 100644
index 0000000000..9b0ef81635
--- /dev/null
+++ b/tests/auto/quick/pointerhandlers/qquickdraghandler/data/DragAnywhereSlider.qml
@@ -0,0 +1,138 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.8
+import Qt.labs.handlers 1.0
+
+Item {
+    id: root
+    objectName: label
+    property int value: 50
+    property int maximumValue: 99
+    property alias label: label.text
+    property alias tapEnabled: tap.enabled
+    property alias pressed: tap.isPressed
+    signal tapped
+    width: 140
+    height: 400
+
+    DragHandler {
+        id: dragHandler
+        objectName: label.text + " DragHandler"
+        target: knob
+        xAxis.enabled: false
+        yAxis.minimum: slot.y
+        yAxis.maximum: slot.height + slot.y - knob.height
+    }
+
+    Rectangle {
+        id: slot
+        anchors.top: parent.top
+        anchors.bottom: parent.bottom
+        anchors.margins: 10
+        anchors.topMargin: 30
+        anchors.bottomMargin: 30
+        anchors.horizontalCenter: parent.horizontalCenter
+        width: 10
+        color: "black"
+        radius: width / 2
+        smooth: true
+    }
+
+    Rectangle {
+        id: glow
+        anchors.fill: knob
+        anchors.margins: -5
+        anchors.leftMargin: -2
+        anchors.horizontalCenterOffset: 1
+        radius: 5
+        color: "#4400FFFF"
+        opacity: tap.isPressed || tapFlash.running ? 1 : 0
+        FlashAnimation on visible {
+            id: tapFlash
+        }
+    }
+    Rectangle {
+        id: knob
+        objectName: "Slider Knob"
+        width: parent.width - 2
+        height: 30
+        radius: 5
+        color: "darkgray"
+        border.color: "black"
+        property bool programmatic: false
+        property real multiplier: root.maximumValue / (dragHandler.yAxis.maximum - dragHandler.yAxis.minimum)
+        onYChanged: if (!programmatic) root.value = root.maximumValue - (knob.y - dragHandler.yAxis.minimum) * multiplier
+        transformOrigin: Item.Center
+        function setValue(value) { knob.y = dragHandler.yAxis.maximum - value / knob.multiplier }
+        TapHandler {
+            id: tap
+            objectName: label.text + " TapHandler"
+            gesturePolicy: TapHandler.DragThreshold
+            onTapped: {
+                tapFlash.start()
+                root.tapped
+            }
+        }
+    }
+
+    Text {
+        font.pointSize: 16
+        color: "red"
+        anchors.bottom: parent.bottom
+        anchors.horizontalCenter: parent.horizontalCenter
+        text: root.value
+    }
+
+    Text {
+        id: label
+        font.pointSize: 12
+        color: "red"
+        anchors.top: parent.top
+        anchors.topMargin: 5
+        anchors.horizontalCenter: parent.horizontalCenter
+    }
+
+    Component.onCompleted: {
+        knob.programmatic = true
+        knob.setValue(root.value)
+        knob.programmatic = false
+    }
+}
diff --git a/tests/auto/quick/pointerhandlers/qquickdraghandler/data/FlashAnimation.qml b/tests/auto/quick/pointerhandlers/qquickdraghandler/data/FlashAnimation.qml
new file mode 100644
index 0000000000..2224276819
--- /dev/null
+++ b/tests/auto/quick/pointerhandlers/qquickdraghandler/data/FlashAnimation.qml
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+
+SequentialAnimation {
+    id: tapFlash
+    running: false
+    PropertyAction { value: false }
+    PauseAnimation { duration: 100 }
+    PropertyAction { value: true }
+    PauseAnimation { duration: 100 }
+    PropertyAction { value: false }
+    PauseAnimation { duration: 100 }
+    PropertyAction { value: true }
+    PauseAnimation { duration: 100 }
+    PropertyAction { value: false }
+    PauseAnimation { duration: 100 }
+    PropertyAction { value: true }
+}
diff --git a/tests/auto/quick/pointerhandlers/qquickdraghandler/data/Slider.qml b/tests/auto/quick/pointerhandlers/qquickdraghandler/data/Slider.qml
new file mode 100644
index 0000000000..81c261fc7a
--- /dev/null
+++ b/tests/auto/quick/pointerhandlers/qquickdraghandler/data/Slider.qml
@@ -0,0 +1,137 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.8
+import Qt.labs.handlers 1.0
+
+Item {
+    id: root
+    objectName: label
+    property int value: 50
+    property int maximumValue: 99
+    property alias label: label.text
+    property alias tapEnabled: tap.enabled
+    property alias pressed: tap.isPressed
+    signal tapped
+    width: 140
+    height: 400
+
+    Rectangle {
+        id: slot
+        anchors.top: parent.top
+        anchors.bottom: parent.bottom
+        anchors.margins: 10
+        anchors.topMargin: 30
+        anchors.bottomMargin: 30
+        anchors.horizontalCenter: parent.horizontalCenter
+        width: 10
+        color: "black"
+        radius: width / 2
+        smooth: true
+    }
+
+    Rectangle {
+        id: glow
+        anchors.fill: knob
+        anchors.margins: -5
+        anchors.leftMargin: -2
+        anchors.horizontalCenterOffset: 1
+        radius: 5
+        color: "#4400FFFF"
+        opacity: tap.isPressed || tapFlash.running ? 1 : 0
+        FlashAnimation on visible {
+            id: tapFlash
+        }
+    }
+    Rectangle {
+        id: knob
+        objectName: root.label + " Knob"
+        width: parent.width - 2
+        height: 30
+        radius: 5
+        color: "darkgray"
+        border.color: "black"
+        property bool programmatic: false
+        property real multiplier: root.maximumValue / (dragHandler.yAxis.maximum - dragHandler.yAxis.minimum)
+        onYChanged: if (!programmatic) root.value = root.maximumValue - (knob.y - dragHandler.yAxis.minimum) * multiplier
+        transformOrigin: Item.Center
+        function setValue(value) { knob.y = dragHandler.yAxis.maximum - value / knob.multiplier }
+        function flash() { tapFlash.start() }
+        DragHandler {
+            id: dragHandler
+            objectName: label.text + " DragHandler"
+            xAxis.enabled: false
+            yAxis.minimum: slot.y
+            yAxis.maximum: slot.height + slot.y - knob.height
+        }
+        TapHandler {
+            id: tap
+            objectName: label.text + " TapHandler"
+            gesturePolicy: TapHandler.DragThreshold
+            onTapped: {
+                tapFlash.start()
+                root.tapped
+            }
+        }
+    }
+
+    Text {
+        font.pointSize: 16
+        color: "red"
+        anchors.bottom: parent.bottom
+        anchors.horizontalCenter: parent.horizontalCenter
+        text: root.value
+    }
+
+    Text {
+        id: label
+        font.pointSize: 12
+        color: "red"
+        anchors.top: parent.top
+        anchors.topMargin: 5
+        anchors.horizontalCenter: parent.horizontalCenter
+    }
+
+    Component.onCompleted: {
+        knob.programmatic = true
+        knob.setValue(root.value)
+        knob.programmatic = false
+    }
+}
diff --git a/tests/auto/quick/pointerhandlers/qquickdraghandler/data/draggables.qml b/tests/auto/quick/pointerhandlers/qquickdraghandler/data/draggables.qml
new file mode 100644
index 0000000000..cfacd69858
--- /dev/null
+++ b/tests/auto/quick/pointerhandlers/qquickdraghandler/data/draggables.qml
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the manual tests of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.8
+import Qt.labs.handlers 1.0
+
+Item {
+    id: root
+    objectName: "Draggables"
+    width: 640
+    height: 480
+
+    Repeater {
+        model: 2
+
+        Rectangle {
+            id: ball
+            objectName: "Ball " + index
+            color: dragHandler.active ? "blue" : "lightsteelblue"
+            width: 80; height: 80; x: 200 + index * 200; y: 200; radius: width / 2
+            onParentChanged: console.log(this + " parent " + parent)
+
+            DragHandler {
+                id: dragHandler
+                objectName: "DragHandler " + index
+            }
+
+            Text {
+                color: "white"
+                anchors.centerIn: parent
+                text: dragHandler.pos.x.toFixed(1) + "," + dragHandler.pos.y.toFixed(1)
+            }
+        }
+    }
+}
diff --git a/tests/auto/quick/pointerhandlers/qquickdraghandler/data/multipleSliders.qml b/tests/auto/quick/pointerhandlers/qquickdraghandler/data/multipleSliders.qml
new file mode 100644
index 0000000000..bcb16f54cb
--- /dev/null
+++ b/tests/auto/quick/pointerhandlers/qquickdraghandler/data/multipleSliders.qml
@@ -0,0 +1,79 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.8
+import Qt.labs.handlers 1.0
+
+Rectangle {
+    id: root
+    width: 900
+    height: 850
+    objectName: "root"
+    color: "#222222"
+
+    Grid {
+        objectName: "grid"
+        anchors.fill: parent
+        spacing: 10
+        columns: 6
+        Repeater {
+            id: top
+            objectName: "top"
+            model: 6
+
+            delegate: Slider {
+                objectName: label
+                label: "Drag Knob " + index
+                width: 140
+            }
+        }
+        Repeater {
+            id: bottom
+            objectName: "bottom"
+            model: 6
+
+            delegate: DragAnywhereSlider {
+                objectName: label
+                label: "Drag Anywhere " + index
+                width: 140
+            }
+        }
+    }
+}
diff --git a/tests/auto/quick/pointerhandlers/qquickdraghandler/data/reparenting.qml b/tests/auto/quick/pointerhandlers/qquickdraghandler/data/reparenting.qml
new file mode 100644
index 0000000000..3545badd86
--- /dev/null
+++ b/tests/auto/quick/pointerhandlers/qquickdraghandler/data/reparenting.qml
@@ -0,0 +1,60 @@
+import QtQuick 2.8
+import Qt.labs.handlers 1.0
+
+Grid {
+    id: root
+    objectName: "root"
+    property bool reparentOnDrag: true
+    width: 200; height: 200
+    columns: 3
+    spacing: 10
+    Repeater {
+        model: 9
+        anchors.fill: parent
+        Item {
+            id: gridPlaceholder
+            objectName: "gridPlaceholder" + index
+            width: 60
+            height: 60
+            Rectangle {
+                id: icon
+                border.color: "black"
+                color: "beige"
+                radius: 3
+                width: 60
+                height: 60
+                onParentChanged :console.log("parent " + parent)
+                anchors {
+                    horizontalCenter: parent.horizontalCenter
+                    verticalCenter: parent.verticalCenter
+                }
+                DragHandler {
+                    id: dragArea
+                }
+                Text {
+                    anchors.centerIn: parent
+                    text: index + "@" + Math.round(icon.x) + "," + Math.round(icon.y)
+                    font.pointSize: 8
+                }
+                states: [
+                    State {
+                        when: dragArea.dragging
+                        AnchorChanges {
+                            target: icon
+                            anchors.horizontalCenter: undefined
+                            anchors.verticalCenter: undefined
+                        }
+                        ParentChange {
+                            target: root.reparentOnDrag ? icon : null
+                            parent: root
+                        }
+                        PropertyChanges {
+                            target: icon
+                            color: "yellow"
+                        }
+                    }
+                ]
+            }
+        }
+    }
+}
diff --git a/tests/auto/quick/pointerhandlers/qquickdraghandler/qquickdraghandler.pro b/tests/auto/quick/pointerhandlers/qquickdraghandler/qquickdraghandler.pro
new file mode 100644
index 0000000000..b50fe5ca6f
--- /dev/null
+++ b/tests/auto/quick/pointerhandlers/qquickdraghandler/qquickdraghandler.pro
@@ -0,0 +1,15 @@
+CONFIG += testcase
+
+TARGET = tst_qquickdraghandler
+QT += core-private gui-private qml-private quick-private  testlib
+
+macos:CONFIG -= app_bundle
+
+SOURCES  += tst_qquickdraghandler.cpp
+
+include (../../../shared/util.pri)
+include (../../shared/util.pri)
+
+TESTDATA = data/*
+
+# OTHER_FILES += data/foo.qml
diff --git a/tests/auto/quick/pointerhandlers/qquickdraghandler/tst_qquickdraghandler.cpp b/tests/auto/quick/pointerhandlers/qquickdraghandler/tst_qquickdraghandler.cpp
new file mode 100644
index 0000000000..5b59911965
--- /dev/null
+++ b/tests/auto/quick/pointerhandlers/qquickdraghandler/tst_qquickdraghandler.cpp
@@ -0,0 +1,405 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+
+#include <QtQml/qqmlengine.h>
+#include <QtQml/qqmlproperty.h>
+#include <QtQuick/private/qquickdraghandler_p.h>
+#include <QtQuick/private/qquickrepeater_p.h>
+#include <QtQuick/private/qquicktaphandler_p.h>
+#include <QtQuick/qquickitem.h>
+#include <QtQuick/qquickview.h>
+
+#include "../../../shared/util.h"
+#include "../../shared/viewtestutil.h"
+
+Q_LOGGING_CATEGORY(lcPointerTests, "qt.quick.pointer.tests")
+
+class tst_DragHandler : public QQmlDataTest
+{
+    Q_OBJECT
+public:
+    tst_DragHandler()
+        :touchDevice(QTest::createTouchDevice())
+    {}
+
+private slots:
+    void initTestCase();
+
+    void defaultPropertyValues();
+    void touchDrag();
+    void mouseDrag();
+    void touchDragMulti();
+    void touchDragMultiSliders_data();
+    void touchDragMultiSliders();
+
+private:
+    void createView(QScopedPointer<QQuickView> &window, const char *fileName);
+    QTouchDevice *touchDevice;
+};
+
+void tst_DragHandler::createView(QScopedPointer<QQuickView> &window, const char *fileName)
+{
+    window.reset(new QQuickView);
+    window->setSource(testFileUrl(fileName));
+    QTRY_COMPARE(window->status(), QQuickView::Ready);
+    QQuickViewTestUtil::centerOnScreen(window.data());
+    QQuickViewTestUtil::moveMouseAway(window.data());
+
+    window->show();
+    QVERIFY(QTest::qWaitForWindowActive(window.data()));
+    QVERIFY(window->rootObject() != 0);
+}
+
+void tst_DragHandler::initTestCase()
+{
+    // This test assumes that we don't get synthesized mouse events from QGuiApplication
+    qApp->setAttribute(Qt::AA_SynthesizeMouseForUnhandledTouchEvents, false);
+
+    QQmlDataTest::initTestCase();
+}
+
+void tst_DragHandler::defaultPropertyValues()
+{
+    QScopedPointer<QQuickView> windowPtr;
+    createView(windowPtr, "draggables.qml");
+    QQuickView * window = windowPtr.data();
+
+    QQuickItem *ball = window->rootObject()->childItems().first();
+    QVERIFY(ball);
+    QQuickDragHandler *dragHandler = ball->findChild<QQuickDragHandler*>();
+    QVERIFY(dragHandler);
+
+    QCOMPARE(dragHandler->acceptedButtons(), Qt::LeftButton);
+    QCOMPARE(dragHandler->translation(), QPointF());
+    QCOMPARE(dragHandler->point().position(), QPointF());
+    QCOMPARE(dragHandler->point().scenePosition(), QPointF());
+    QCOMPARE(dragHandler->point().pressPosition(), QPointF());
+    QCOMPARE(dragHandler->point().scenePressPosition(), QPointF());
+    QCOMPARE(dragHandler->point().sceneGrabPosition(), QPointF());
+}
+
+void tst_DragHandler::touchDrag()
+{
+    const int dragThreshold = QGuiApplication::styleHints()->startDragDistance();
+    QScopedPointer<QQuickView> windowPtr;
+    createView(windowPtr, "draggables.qml");
+    QQuickView * window = windowPtr.data();
+
+    QQuickItem *ball = window->rootObject()->childItems().first();
+    QVERIFY(ball);
+    QQuickDragHandler *dragHandler = ball->findChild<QQuickDragHandler*>();
+    QVERIFY(dragHandler);
+
+    QSignalSpy translationChangedSpy(dragHandler, SIGNAL(translationChanged()));
+
+    QPointF ballCenter = ball->clipRect().center();
+    QPointF scenePressPos = ball->mapToScene(ballCenter);
+    QPoint p1 = scenePressPos.toPoint();
+    QTest::touchEvent(window, touchDevice).press(1, p1, window);
+    QQuickTouchUtils::flush(window);
+    QVERIFY(!dragHandler->active());
+    QCOMPARE(dragHandler->point().position(), ballCenter);
+    QCOMPARE(dragHandler->point().pressPosition(), ballCenter);
+    QCOMPARE(dragHandler->point().scenePosition(), scenePressPos);
+    QCOMPARE(dragHandler->point().scenePressPosition(), scenePressPos);
+    p1 += QPoint(dragThreshold, 0);
+    QTest::touchEvent(window, touchDevice).move(1, p1, window);
+    QQuickTouchUtils::flush(window);
+    QVERIFY(!dragHandler->active());
+    p1 += QPoint(1, 0);
+    QTest::touchEvent(window, touchDevice).move(1, p1, window);
+    QQuickTouchUtils::flush(window);
+    QTRY_VERIFY(dragHandler->active());
+    QCOMPARE(translationChangedSpy.count(), 0);
+    QCOMPARE(dragHandler->translation().x(), 0.0);
+    QPointF sceneGrabPos = p1;
+    QCOMPARE(dragHandler->point().sceneGrabPosition(), sceneGrabPos);
+    p1 += QPoint(19, 0);
+    QTest::touchEvent(window, touchDevice).move(1, p1, window);
+    QQuickTouchUtils::flush(window);
+    QTRY_VERIFY(dragHandler->active());
+    QCOMPARE(dragHandler->point().position(), ballCenter);
+    QCOMPARE(dragHandler->point().pressPosition(), ballCenter);
+    QCOMPARE(dragHandler->point().scenePosition(), ball->mapToScene(ballCenter));
+    QCOMPARE(dragHandler->point().scenePressPosition(), scenePressPos);
+    QCOMPARE(dragHandler->point().sceneGrabPosition(), sceneGrabPos);
+    QCOMPARE(dragHandler->translation().x(), dragThreshold + 20.0);
+    QCOMPARE(dragHandler->translation().y(), 0.0);
+    QTest::touchEvent(window, touchDevice).release(1, p1, window);
+    QQuickTouchUtils::flush(window);
+    QTRY_VERIFY(!dragHandler->active());
+    QCOMPARE(dragHandler->point().pressedButtons(), Qt::NoButton);
+    QCOMPARE(ball->mapToScene(ballCenter).toPoint(), p1);
+    QCOMPARE(translationChangedSpy.count(), 1);
+}
+
+void tst_DragHandler::mouseDrag()
+{
+    const int dragThreshold = QGuiApplication::styleHints()->startDragDistance();
+    QScopedPointer<QQuickView> windowPtr;
+    createView(windowPtr, "draggables.qml");
+    QQuickView * window = windowPtr.data();
+
+    QQuickItem *ball = window->rootObject()->childItems().first();
+    QVERIFY(ball);
+    QQuickDragHandler *dragHandler = ball->findChild<QQuickDragHandler*>();
+    QVERIFY(dragHandler);
+
+    QSignalSpy translationChangedSpy(dragHandler, SIGNAL(translationChanged()));
+
+    QPointF ballCenter = ball->clipRect().center();
+    QPointF scenePressPos = ball->mapToScene(ballCenter);
+    QPoint p1 = scenePressPos.toPoint();
+    QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, p1);
+    QVERIFY(!dragHandler->active());
+    QCOMPARE(dragHandler->point().position(), ballCenter);
+    QCOMPARE(dragHandler->point().pressPosition(), ballCenter);
+    QCOMPARE(dragHandler->point().scenePosition(), scenePressPos);
+    QCOMPARE(dragHandler->point().scenePressPosition(), scenePressPos);
+    p1 += QPoint(dragThreshold, 0);
+    QTest::mouseMove(window, p1);
+    QVERIFY(!dragHandler->active());
+    p1 += QPoint(1, 0);
+    QTest::mouseMove(window, p1);
+    QTRY_VERIFY(dragHandler->active());
+    QCOMPARE(translationChangedSpy.count(), 0);
+    QCOMPARE(dragHandler->translation().x(), 0.0);
+    QPointF sceneGrabPos = p1;
+    QCOMPARE(dragHandler->point().sceneGrabPosition(), sceneGrabPos);
+    p1 += QPoint(19, 0);
+    QTest::mouseMove(window, p1);
+    QTRY_VERIFY(dragHandler->active());
+    QCOMPARE(dragHandler->point().position(), ballCenter);
+    QCOMPARE(dragHandler->point().pressPosition(), ballCenter);
+    QCOMPARE(dragHandler->point().scenePosition(), ball->mapToScene(ballCenter));
+    QCOMPARE(dragHandler->point().scenePressPosition(), scenePressPos);
+    QCOMPARE(dragHandler->point().sceneGrabPosition(), sceneGrabPos);
+    QCOMPARE(dragHandler->translation().x(), dragThreshold + 20.0);
+    QCOMPARE(dragHandler->translation().y(), 0.0);
+    QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, p1);
+    QTRY_VERIFY(!dragHandler->active());
+    QCOMPARE(dragHandler->point().pressedButtons(), Qt::NoButton);
+    QCOMPARE(ball->mapToScene(ballCenter).toPoint(), p1);
+    QCOMPARE(translationChangedSpy.count(), 1);
+}
+
+void tst_DragHandler::touchDragMulti()
+{
+    const int dragThreshold = QGuiApplication::styleHints()->startDragDistance();
+    QScopedPointer<QQuickView> windowPtr;
+    createView(windowPtr, "draggables.qml");
+    QQuickView * window = windowPtr.data();
+
+    QQuickItem *ball1 = window->rootObject()->childItems().first();
+    QVERIFY(ball1);
+    QQuickDragHandler *dragHandler1 = ball1->findChild<QQuickDragHandler*>();
+    QVERIFY(dragHandler1);
+    QSignalSpy translationChangedSpy1(dragHandler1, SIGNAL(translationChanged()));
+
+    QQuickItem *ball2 = window->rootObject()->childItems().at(1);
+    QVERIFY(ball2);
+    QQuickDragHandler *dragHandler2 = ball2->findChild<QQuickDragHandler*>();
+    QVERIFY(dragHandler2);
+    QSignalSpy translationChangedSpy2(dragHandler2, SIGNAL(translationChanged()));
+
+    QPointF ball1Center = ball1->clipRect().center();
+    QPointF scenePressPos1 = ball1->mapToScene(ball1Center);
+    QPoint p1 = scenePressPos1.toPoint();
+    QPointF ball2Center = ball2->clipRect().center();
+    QPointF scenePressPos2 = ball2->mapToScene(ball2Center);
+    QPoint p2 = scenePressPos2.toPoint();
+
+    QTest::touchEvent(window, touchDevice).press(1, p1, window).press(2, p2, window);
+    QQuickTouchUtils::flush(window);
+    QVERIFY(!dragHandler1->active());
+    QCOMPARE(dragHandler1->point().position(), ball1Center);
+    QCOMPARE(dragHandler1->point().pressPosition(), ball1Center);
+    QCOMPARE(dragHandler1->point().scenePosition(), scenePressPos1);
+    QCOMPARE(dragHandler1->point().scenePressPosition(), scenePressPos1);
+    QVERIFY(!dragHandler2->active());
+    QCOMPARE(dragHandler2->point().position(), ball2Center);
+    QCOMPARE(dragHandler2->point().pressPosition(), ball2Center);
+    QCOMPARE(dragHandler2->point().scenePosition(), scenePressPos2);
+    QCOMPARE(dragHandler2->point().scenePressPosition(), scenePressPos2);
+    p1 += QPoint(dragThreshold, 0);
+    p2 += QPoint(0, dragThreshold);
+    QTest::touchEvent(window, touchDevice).move(1, p1, window).move(2, p2, window);
+    QQuickTouchUtils::flush(window);
+    QVERIFY(!dragHandler1->active());
+    p1 += QPoint(1, 0);
+    p2 += QPoint(0, 1);
+    QTest::touchEvent(window, touchDevice).move(1, p1, window).move(2, p2, window);
+    QQuickTouchUtils::flush(window);
+    QTRY_VERIFY(dragHandler1->active());
+    QVERIFY(dragHandler2->active());
+    QCOMPARE(translationChangedSpy1.count(), 0);
+    QCOMPARE(dragHandler1->translation().x(), 0.0);
+    QPointF sceneGrabPos1 = p1;
+    QPointF sceneGrabPos2 = p2;
+    QCOMPARE(dragHandler1->point().sceneGrabPosition(), sceneGrabPos1);
+    QCOMPARE(dragHandler2->point().sceneGrabPosition(), sceneGrabPos2);
+    p1 += QPoint(19, 0);
+    p2 += QPoint(0, 19);
+    QVERIFY(dragHandler2->active());
+    QCOMPARE(translationChangedSpy2.count(), 0);
+    QCOMPARE(dragHandler2->translation().x(), 0.0);
+    QCOMPARE(dragHandler2->point().sceneGrabPosition(), sceneGrabPos2);
+    QTest::touchEvent(window, touchDevice).move(1, p1, window).move(2, p2, window);
+    QQuickTouchUtils::flush(window);
+    QVERIFY(dragHandler1->active());
+    QVERIFY(dragHandler2->active());
+    QCOMPARE(dragHandler1->point().position(), ball1Center);
+    QCOMPARE(dragHandler1->point().pressPosition(), ball1Center);
+    QCOMPARE(dragHandler1->point().scenePosition(), ball1->mapToScene(ball1Center));
+    QCOMPARE(dragHandler1->point().scenePressPosition(), scenePressPos1);
+    QCOMPARE(dragHandler1->point().sceneGrabPosition(), sceneGrabPos1);
+    QCOMPARE(dragHandler1->translation().x(), dragThreshold + 20.0);
+    QCOMPARE(dragHandler1->translation().y(), 0.0);
+    QCOMPARE(dragHandler2->point().position(), ball2Center);
+    QCOMPARE(dragHandler2->point().pressPosition(), ball2Center);
+    QCOMPARE(dragHandler2->point().scenePosition(), ball2->mapToScene(ball2Center));
+    QCOMPARE(dragHandler2->point().scenePressPosition(), scenePressPos2);
+    QCOMPARE(dragHandler2->point().sceneGrabPosition(), sceneGrabPos2);
+    QCOMPARE(dragHandler2->translation().x(), 0.0);
+    QCOMPARE(dragHandler2->translation().y(), dragThreshold + 20.0);
+    QTest::touchEvent(window, touchDevice).release(1, p1, window).stationary(2);
+    QQuickTouchUtils::flush(window);
+    QTRY_VERIFY(!dragHandler1->active());
+    QVERIFY(dragHandler2->active());
+    QCOMPARE(dragHandler1->point().pressedButtons(), Qt::NoButton);
+    QCOMPARE(ball1->mapToScene(ball1Center).toPoint(), p1);
+    QCOMPARE(translationChangedSpy1.count(), 1);
+    QTest::touchEvent(window, touchDevice).release(2, p2, window);
+    QQuickTouchUtils::flush(window);
+    QTRY_VERIFY(!dragHandler2->active());
+    QCOMPARE(ball2->mapToScene(ball2Center).toPoint(), p2);
+    QCOMPARE(translationChangedSpy2.count(), 1);
+}
+
+void tst_DragHandler::touchDragMultiSliders_data()
+{
+    QTest::addColumn<int>("sliderRow");
+    QTest::addColumn<QVector<int> >("whichSliders");
+    QTest::addColumn<QVector<int> >("startingCenterOffsets");
+    QTest::addColumn<QVector<QVector2D> >("movements");
+
+    QTest::newRow("Drag Knob: start on the knobs, drag down") <<
+        0 << QVector<int> { 0, 1, 2 } << QVector<int> { 0, 0, 0 } << QVector<QVector2D> { {0, 60}, {0, 60}, {0, 60} };
+    QTest::newRow("Drag Knob: start on the knobs, drag diagonally downward") <<
+        0 << QVector<int> { 0, 1, 2 } << QVector<int> { 0, 0, 0 } << QVector<QVector2D> { {20, 40}, {20, 60}, {20, 80} };
+    // TOOD these fail
+//    QTest::newRow("Drag Anywhere: start on the knobs, drag down") <<
+//        1 << QVector<int> { 0, 1, 2 } << QVector<int> { 0, 0, 0 } << QVector<QVector2D> { {0, 60}, {0, 60}, {0, 60} };
+//    QTest::newRow("Drag Anywhere: start on the knobs, drag diagonally downward") <<
+//        1 << QVector<int> { 0, 1, 2 } << QVector<int> { 0, 0, 0 } << QVector<QVector2D> { {20, 40}, {20, 60}, {20, 80} };
+    // TODO these next two fail because the DragHandler grabs when a finger
+    // drags across it from outside, but should rather start only if it is pressed inside
+//    QTest::newRow("Drag Knob: start above the knobs, drag down") <<
+//        0 << QVector<int> { 0, 1, 2 } << QVector<int> { -30, -30, -30 } << QVector<QVector2D> { {0, 40}, {0, 60}, {0, 80} };
+//    QTest::newRow("Drag Knob: start above the knobs, drag diagonally downward") <<
+//        0 << QVector<int> { 0, 1, 2 } << QVector<int> { -30, -30, -30 } << QVector<QVector2D> { {20, 40}, {20, 60}, {20, 80} };
+    QTest::newRow("Drag Anywhere: start above the knobs, drag down") <<
+        1 << QVector<int> { 0, 1, 2 } << QVector<int> { -20, -30, -40 } << QVector<QVector2D> { {0, 60}, {0, 60}, {0, 60} };
+    QTest::newRow("Drag Anywhere: start above the knobs, drag diagonally downward") <<
+        1 << QVector<int> { 0, 1, 2 } << QVector<int> { -20, -30, -40 } << QVector<QVector2D> { {20, 40}, {20, 60}, {20, 80} };
+}
+
+void tst_DragHandler::touchDragMultiSliders()
+{
+    QFETCH(int, sliderRow);
+    QFETCH(QVector<int>, whichSliders);
+    QFETCH(QVector<int>, startingCenterOffsets);
+    QFETCH(QVector<QVector2D>, movements);
+    const int moveCount = 8;
+
+    QScopedPointer<QQuickView> windowPtr;
+    createView(windowPtr, "multipleSliders.qml");
+    QQuickView * window = windowPtr.data();
+    QTest::QTouchEventSequence touch = QTest::touchEvent(window, touchDevice);
+
+    QQuickRepeater *rowRepeater = window->rootObject()->findChildren<QQuickRepeater *>()[sliderRow];
+    QVector<QQuickItem *> knobs;
+    QVector<QQuickDragHandler *> dragHandlers;
+    QVector<QQuickTapHandler *> tapHandlers;
+    QVector<QPointF> startPoints;
+    for (int sli : whichSliders) {
+        QQuickItem *slider = rowRepeater->itemAt(sli);
+        QVERIFY(slider);
+        dragHandlers << slider->findChild<QQuickDragHandler*>();
+        QVERIFY(dragHandlers[sli]);
+        tapHandlers << slider->findChild<QQuickTapHandler*>();
+        QVERIFY(tapHandlers[sli]);
+        knobs << tapHandlers[sli]->parentItem();
+        QPointF startPoint = knobs[sli]->mapToScene(knobs[sli]->clipRect().center());
+        startPoint.setY(startPoint.y() + startingCenterOffsets[sli]);
+        startPoints << startPoint;
+        qCDebug(lcPointerTests) << "row" << sliderRow << "slider" << sli << slider->objectName() <<
+            "start" << startingCenterOffsets[sli] << startPoints[sli];
+    }
+    QVector<QPointF> touchPoints = startPoints;
+
+    // Press
+    for (int sli : whichSliders)
+        touch.press(sli, touchPoints[sli].toPoint());
+    touch.commit();
+
+    // Moves
+    for (int m = 0; m < moveCount; ++m) {
+        for (int sli : whichSliders) {
+            QVector2D incr = movements[sli] / moveCount;
+            touchPoints[sli] += incr.toPointF();
+            touch.move(sli, touchPoints[sli].toPoint());
+        }
+        touch.commit();
+        QQuickTouchUtils::flush(window);
+    }
+
+    // Check that they moved to where they should: since the slider is constrained,
+    // only the y component should have an effect; knobs should not come out of their "grooves"
+    for (int sli : whichSliders) {
+        QPoint endPosition = knobs[sli]->mapToScene(knobs[sli]->clipRect().center()).toPoint();
+        QPoint expectedEndPosition(startPoints[sli].x(), startPoints[sli].y() + movements[sli].y());
+        if (sliderRow == 0 && qAbs(startingCenterOffsets[sli]) > knobs[sli]->height() / 2)
+            expectedEndPosition = startPoints[sli].toPoint();
+        qCDebug(lcPointerTests) << "slider " << knobs[sli]->objectName() << "started @" << startPoints[sli]
+            << "tried to move by" << movements[sli] << "ended up @" << endPosition << "expected" << expectedEndPosition;
+        QTRY_COMPARE(endPosition, expectedEndPosition);
+    }
+
+    // Release
+    for (int sli : whichSliders)
+        touch.release(sli, touchPoints[sli].toPoint());
+    touch.commit();
+}
+
+QTEST_MAIN(tst_DragHandler)
+
+#include "tst_qquickdraghandler.moc"
+