Modernize tst_QQuickPathView::treeModel()

- Don't use context properties: a singleton is better
- Use required properties to declare dependendencies

Change-Id: I10a0a301e0a397b1d4fc9edf804eea3499c79025
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

2 files changed, 12 insertions, 8 deletions

diff --git a/tests/auto/quick/qquickpathview/data/treemodel.qml b/tests/auto/quick/qquickpathview/data/treemodel.qml
index b1e06f47d2..a39b4db6bf 100644
--- a/tests/auto/quick/qquickpathview/data/treemodel.qml
+++ b/tests/auto/quick/qquickpathview/data/treemodel.qml
@@ -1,5 +1,6 @@
-import QtQuick 2.0
-import QtQml.Models 2.12
+import QtQuick 2.15
+import QtQml.Models 2.15
+import Qt.treemodel
 
 PathView {
     width: 320
@@ -9,8 +10,12 @@ PathView {
     }
     model: DelegateModel {
         id: vdm
-        model: myModel
-        delegate: Text { objectName: "wrapper"; text: display }
+        model: TreeModelCpp
+        delegate: Text {
+            required property string display
+            objectName: "wrapper"
+            text: display
+        }
     }
 
     path: Path {
diff --git a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
index 0d2810b519..da350e6a39 100644
--- a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
+++ b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
@@ -1672,13 +1672,12 @@ void tst_QQuickPathView::flickNClick() // QTBUG-77173
 
 void tst_QQuickPathView::treeModel()
 {
-    QScopedPointer<QQuickView> window(createView());
-    window->show();
-
     QStandardItemModel model;
     initStandardTreeModel(&model);
-    window->engine()->rootContext()->setContextProperty("myModel", &model);
+    qmlRegisterSingletonInstance("Qt.treemodel", 1, 0, "TreeModelCpp", &model);
 
+    QScopedPointer<QQuickView> window(createView());
+    window->show();
     window->setSource(testFileUrl("treemodel.qml"));
 
     QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject());