Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake

Change-Id: I6f2152aeecaeb8e63fdbc1cdf1444132a054b6f5

1 files changed, 5 insertions, 2 deletions

diff --git a/tests/auto/qml/qqmlexpression/tst_qqmlexpression.cpp b/tests/auto/qml/qqmlexpression/tst_qqmlexpression.cpp
index 1decc04ad2..0ba29d6b6a 100644
--- a/tests/auto/qml/qqmlexpression/tst_qqmlexpression.cpp
+++ b/tests/auto/qml/qqmlexpression/tst_qqmlexpression.cpp
@@ -28,6 +28,7 @@
 
 #include <qtest.h>
 #include <QtQml/qqmlengine.h>
+#include <QtQml/qqmlfile.h>
 #include <QtQml/qqmlcomponent.h>
 #include <QtQml/qqmlexpression.h>
 #include <QtQml/qqmlscriptstring.h>
@@ -125,10 +126,12 @@ void tst_qqmlexpression::expressionFromDataComponent()
     QQmlEngine engine;
     QQmlComponent c(&engine);
 
-    QUrl url = testFileUrl("expressionFromDataComponent.qml");
+    const QString fn(QLatin1String("expressionFromDataComponent.qml"));
+    QUrl url = testFileUrl(fn);
+    QString path = testFile(fn);
 
     {
-        QFile f(url.toLocalFile());
+        QFile f(path);
         QVERIFY(f.open(QIODevice::ReadOnly));
         c.setData(f.readAll(), url);
     }