tst_qqmlinstatiator: avoid setContextProperty

Change-Id: I0cc64a7ce51d5d1a9d471d4c22486fa73574fb71
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

2 files changed, 8 insertions, 7 deletions

diff --git a/tests/auto/qml/qqmlinstantiator/data/createAndRemove.qml b/tests/auto/qml/qqmlinstantiator/data/createAndRemove.qml
index 5dd322b5f5..40e996ee4a 100644
--- a/tests/auto/qml/qqmlinstantiator/data/createAndRemove.qml
+++ b/tests/auto/qml/qqmlinstantiator/data/createAndRemove.qml
@@ -1,18 +1,19 @@
 import QtQml 2.1
 import QtQuick 2.1
+import Test 1.0
 
 Rectangle {
     Instantiator {
         objectName: "instantiator1"
-        model: model1
+        model: Model1
         delegate: QtObject {
             property string datum: model.text
         }
     }
     Component.onCompleted: {
-        model1.add("Delta");
-        model1.add("Gamma");
-        model1.add("Beta");
-        model1.add("Alpha");
+        Model1.add("Delta");
+        Model1.add("Gamma");
+        Model1.add("Beta");
+        Model1.add("Alpha");
     }
 }
diff --git a/tests/auto/qml/qqmlinstantiator/tst_qqmlinstantiator.cpp b/tests/auto/qml/qqmlinstantiator/tst_qqmlinstantiator.cpp
index 9c5e09c77c..84e08c471a 100644
--- a/tests/auto/qml/qqmlinstantiator/tst_qqmlinstantiator.cpp
+++ b/tests/auto/qml/qqmlinstantiator/tst_qqmlinstantiator.cpp
@@ -190,9 +190,9 @@ void tst_qqmlinstantiator::intModelChange()
 void tst_qqmlinstantiator::createAndRemove()
 {
     QQmlEngine engine;
+    QScopedPointer<StringModel> model {new StringModel("model1")};
+    qmlRegisterSingletonInstance("Test", 1, 0, "Model1", model.get());
     QQmlComponent component(&engine, testFileUrl("createAndRemove.qml"));
-    StringModel *model = new StringModel("model1");
-    engine.rootContext()->setContextProperty("model1", model);
     QObject *rootObject = component.create();
     QVERIFY(rootObject != nullptr);