Merge branch 'wip/pointerhandler' into dev

Change-Id: Ifae425744d69779a661c7465d33163a7d53fb8a4

1 files changed, 60 insertions, 0 deletions

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"
+                        }
+                    }
+                ]
+            }
+        }
+    }
+}