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

Change-Id: I762e578aaf14a77efa26ce3fda2abb0e335003ea

1 files changed, 3 insertions, 8 deletions

diff --git a/src/imports/testlib/TestCase.qml b/src/imports/testlib/TestCase.qml
index ad7533c550..18c70e1169 100644
--- a/src/imports/testlib/TestCase.qml
+++ b/src/imports/testlib/TestCase.qml
@@ -567,7 +567,7 @@ Item {
         \qmlmethod object TestCase::createTemporaryObject(Component component, object parent, object properties)
 
         This function dynamically creates a QML object from the given
-        \a component with the specified \a parent and \a properties.
+        \a component with the specified optional \a parent and \a properties.
         The returned object will be destroyed (if it was not already) after
         \l cleanup() has finished executing, meaning that objects created with
         this function are guaranteed to be destroyed after each test,
@@ -589,12 +589,6 @@ Item {
             throw new Error("QtQuickTest::fail");
         }
 
-        if (!parent && parent !== null) {
-            qtest_results.fail("Second argument must be a parent object or null; actual type is " + typeof parent,
-                util.callerFile(), util.callerLine());
-            throw new Error("QtQuickTest::fail");
-        }
-
         if (properties && typeof properties !== "object") {
             qtest_results.fail("Third argument must be an object; actual type is " + typeof properties,
                 util.callerFile(), util.callerLine());
@@ -614,7 +608,8 @@ Item {
     function qtest_destroyTemporaryObjects() {
         for (var i = 0; i < qtest_temporaryObjects.length; ++i) {
             var temporaryObject = qtest_temporaryObjects[i];
-            if (temporaryObject)
+            // ### the typeof check can be removed when QTBUG-57749 is fixed
+            if (temporaryObject && typeof temporaryObject.destroy === "function")
                 temporaryObject.destroy();
         }
         qtest_temporaryObjects = [];