Merge remote-tracking branch 'origin/5.7.1' into 5.7

Change-Id: Idb141c715c7d06d2ecdce403d0f3740ee18b2b8f

1 files changed, 9 insertions, 7 deletions

diff --git a/tests/auto/quick3d/quick3dnodeinstantiator/data/createNone.qml b/tests/auto/quick3d/quick3dnodeinstantiator/data/createNone.qml
index 736a02b45..eef31cb8c 100644
--- a/tests/auto/quick3d/quick3dnodeinstantiator/data/createNone.qml
+++ b/tests/auto/quick3d/quick3dnodeinstantiator/data/createNone.qml
@@ -1,13 +1,15 @@
 import QtQml 2.1
 import Qt3D.Core 2.0
 
-NodeInstantiator {
-    model: 0
-    property bool success: true
-    Entity {
+Entity {
+    NodeInstantiator {
+        model: 0
         property bool success: true
-        property int idx: index
+        Entity {
+            property bool success: true
+            property int idx: index
+        }
+        onObjectChanged: success = false;//Don't create intermediate objects
+        onCountChanged: success = false;//Don't create intermediate objects
     }
-    onObjectChanged: success = false;//Don't create intermediate objects
-    onCountChanged: success = false;//Don't create intermediate objects
 }