Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: I6033aba359ac551f450ad517d20a0986bf4655f6

1 files changed, 18 insertions, 0 deletions

diff --git a/tests/auto/qmltest/selftests/tst_destroy.qml b/tests/auto/qmltest/selftests/tst_destroy.qml
index 962f4a70ef..3b1b80520b 100644
--- a/tests/auto/qmltest/selftests/tst_destroy.qml
+++ b/tests/auto/qmltest/selftests/tst_destroy.qml
@@ -51,4 +51,22 @@ TestCase {
         // The object created in test above should be deleted
         compare(testCase.children.length, 0)
     }
+
+    function test_c_QTBUG_42185_data() {
+   // Adding dummy data objects for the purpose of calling multiple times the test function
+   // and checking that the created object (tmp) is destroyed as expected between each data run.
+        return [{tag: "test 0"}, {tag: "test 1"}, {tag: "test 2"},];
+    }
+
+    function test_c_QTBUG_42185() {
+        compare(testCase.children.length, 0)
+        var tmp = Qt.createQmlObject('import QtQuick 2.1; Rectangle {width: 20; height: 20;}', testCase, '')
+        compare(testCase.children.length, 1)
+        tmp.destroy()
+    }
+
+    function test_d_QTBUG_42185() {
+        // The object created in test above should be deleted
+        compare(testCase.children.length, 0)
+    }
 }