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

Change-Id: I0c5b939c70bdb91ccdf7068784308416dcaa5736

3 files changed, 189 insertions, 0 deletions

diff --git a/tests/auto/particles/qquickitemparticle/data/loader.qml b/tests/auto/particles/qquickitemparticle/data/loader.qml
new file mode 100644
index 0000000000..beac7a0410
--- /dev/null
+++ b/tests/auto/particles/qquickitemparticle/data/loader.qml
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 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: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$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtQuick.Particles 2.0
+
+Rectangle {
+    color: "black"
+    width: 320
+    height: 320
+
+    Component {
+        id: component
+
+        ParticleSystem {
+            id: sys
+            objectName: "system"
+            anchors.fill: parent
+            running: visible
+
+            ItemParticle {
+                delegate: Image { source: "../../shared/star.png" }
+            }
+
+            Emitter {
+                //0,0 position
+                size: 32
+                emitRate: 10
+                lifeSpan: 150000
+            }
+        }
+    }
+
+    Loader {
+        id: loader
+        objectName: "loader"
+        sourceComponent: component
+        anchors.fill: parent
+    }
+}
diff --git a/tests/auto/particles/qquickitemparticle/data/takeGive.qml b/tests/auto/particles/qquickitemparticle/data/takeGive.qml
new file mode 100644
index 0000000000..e95ae738bd
--- /dev/null
+++ b/tests/auto/particles/qquickitemparticle/data/takeGive.qml
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 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: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$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtQuick.Particles 2.0
+
+Rectangle {
+    id: testTakeGive
+    color: "black"
+    width: 320
+    height: 320
+
+    function takeItems()
+    {
+        for(var i = 0; i < imgList.count; i++) ip.take(imgList.itemAt(i));
+    }
+    function giveItems()
+    {
+        for(var i = 0; i < imgList.count; i++) ip.give(imgList.itemAt(i));
+    }
+
+    Repeater {
+        id: imgList
+        model: 100
+        delegate: Image {
+            ItemParticle.onAttached: sys.acc = sys.acc + 1
+            ItemParticle.onDetached: sys.acc = sys.acc - 1;
+            source: "../../shared/star.png"
+        }
+    }
+
+    ParticleSystem {
+        id: sys
+        objectName: "system"
+        anchors.fill: parent
+        property int acc: 0
+
+        ItemParticle {
+            id: ip
+        }
+
+        Emitter{
+            //0,0 position
+            size: 32
+            emitRate: 1000
+            lifeSpan: Emitter.InfiniteLife
+        }
+    }
+}
diff --git a/tests/auto/particles/qquickitemparticle/tst_qquickitemparticle.cpp b/tests/auto/particles/qquickitemparticle/tst_qquickitemparticle.cpp
index d9791cdb33..28ebbb3c05 100644
--- a/tests/auto/particles/qquickitemparticle/tst_qquickitemparticle.cpp
+++ b/tests/auto/particles/qquickitemparticle/tst_qquickitemparticle.cpp
@@ -45,6 +45,9 @@ private slots:
     void test_basic();
     void test_deletion();
     void test_noDeletion();
+    void test_takeGive();
+    void test_noCrashOnReset();
+    void test_noLeakWhenDeleted();
 };
 
 void tst_qquickitemparticle::initTestCase()
@@ -107,6 +110,53 @@ void tst_qquickitemparticle::test_noDeletion()
     delete view;
 }
 
+void tst_qquickitemparticle::test_takeGive()
+{
+    QQuickView* view = createView(testFileUrl("takeGive.qml"), 500);
+    QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system");
+    QMetaObject::invokeMethod(view->rootObject(), "takeItems");
+    ensureAnimTime(1000, system->m_animation);
+    QVERIFY(system->property("acc").toInt() == 100);
+    QMetaObject::invokeMethod(view->rootObject(), "giveItems");
+    QTRY_VERIFY(system->property("acc").toInt() == 0);
+    delete view;
+}
+
+void tst_qquickitemparticle::test_noCrashOnReset()
+{
+    QQuickView* view = createView(testFileUrl("basic.qml"), 600);
+    QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system");
+
+    for (int i = 0; i < 10; ++i) {
+        ensureAnimTime(16, system->m_animation);
+        system->reset();
+    }
+
+    delete view;
+}
+
+void tst_qquickitemparticle::test_noLeakWhenDeleted()
+{
+    QQuickView* view = createView(testFileUrl("loader.qml"), 500);
+    QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system");
+    ensureAnimTime(100, system->m_animation);
+
+    auto particles = qAsConst(system->groupData[0]->data);
+    QVERIFY(!particles.isEmpty());
+
+    QQuickParticleData* firstParticleData = particles.first();
+    QPointer<QQuickItem> firstParticleDelegate = firstParticleData->delegate;
+    QVERIFY(!firstParticleDelegate.isNull());
+
+    QQuickItem* loader = view->rootObject()->findChild<QQuickItem*>("loader");
+    loader->setProperty("active", false); //This should destroy the ParticleSystem, ItemParticle and Emitter
+
+    QTest::qWait(1); //Process events to make sure the loader is properly unloaded
+    QVERIFY(firstParticleDelegate.isNull()); //Delegates should be deleted
+
+    delete view;
+}
+
 QTEST_MAIN(tst_qquickitemparticle);
 
 #include "tst_qquickitemparticle.moc"