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

2 files changed, 89 insertions, 0 deletions

diff --git a/tests/auto/quick/qquickstates/data/parentChangeCorrectReversal.qml b/tests/auto/quick/qquickstates/data/parentChangeCorrectReversal.qml
new file mode 100644
index 0000000000..3d38fa4046
--- /dev/null
+++ b/tests/auto/quick/qquickstates/data/parentChangeCorrectReversal.qml
@@ -0,0 +1,72 @@
+import QtQuick 2.10
+import QtQuick.Layouts 1.3
+
+Item {
+    id: root
+
+    visible: true
+
+    width: 400
+    height: 200
+    property bool switchToRight: false
+    property alias stayingRectX: stayingRect.x
+
+    RowLayout {
+        id: topLayout
+
+        anchors.fill: parent
+
+        Item {
+            Layout.fillWidth: true
+            Layout.fillHeight: true
+
+            Rectangle {
+                id: leftRect
+
+                width: parent.width*(2/3)
+                height: width
+                anchors.centerIn: parent
+
+                color: "red"
+
+                Rectangle {
+                    id: stayingRect
+
+                    x: 70; y: 70
+                    width: 50; height: 50
+
+                    color: "yellow"
+                }
+            }
+        }
+
+        Item {
+            Layout.fillWidth: true
+            Layout.fillHeight: true
+
+            Rectangle {
+                id: rightRect
+
+                width: parent.height*(2/3)
+                height: width
+                anchors.centerIn: parent
+
+                color: "green"
+                rotation: 45
+            }
+        }
+    }
+
+    states: State {
+        name: "switchToRight"
+
+        ParentChange {
+            target: stayingRect
+            parent: rightRect
+            width: 70
+        }
+
+    }
+
+    state: root.switchToRight ? "switchToRight" : ""
+}
diff --git a/tests/auto/quick/qquickstates/tst_qquickstates.cpp b/tests/auto/quick/qquickstates/tst_qquickstates.cpp
index 1eb797f54f..d5fea3cb28 100644
--- a/tests/auto/quick/qquickstates/tst_qquickstates.cpp
+++ b/tests/auto/quick/qquickstates/tst_qquickstates.cpp
@@ -139,6 +139,7 @@ private slots:
     void revertListMemoryLeak();
     void duplicateStateName();
     void trivialWhen();
+    void parentChangeCorrectReversal();
 };
 
 void tst_qquickstates::initTestCase()
@@ -1675,6 +1676,22 @@ void tst_qquickstates::trivialWhen()
     QVERIFY(c.create());
 }
 
+void tst_qquickstates::parentChangeCorrectReversal()
+{
+    QQmlEngine engine;
+    QQmlComponent c(&engine, testFileUrl("parentChangeCorrectReversal.qml"));
+    QScopedPointer<QObject> root {c.create()};
+    QVERIFY(root);
+    QQmlProperty stayingRectX(root.get(), "stayingRectX");
+    qreal oldX = stayingRectX.read().toDouble();
+    QQmlProperty switchToRight(root.get(), "switchToRight");
+    switchToRight.write(true);
+    qreal newX = stayingRectX.read().toDouble();
+    QVERIFY(newX != oldX);
+    switchToRight.write(false);
+    QCOMPARE(oldX, stayingRectX.read().toDouble());
+}
+
 
 QTEST_MAIN(tst_qquickstates)