Do not resolve URLs when assigning them to a property

We don't know in advance if a URL is part of the source code and should
be relative to the current element, or if it is part of the application
data and should not be touched.

[ChangeLog][QtQml][Important Behavior Changes] URLs are not resolved or
intercepted anymore when assigning them to a "url" property. Instead
they are resolved and possibly intercepted when used to access an actual
resource.

Fixes: QTBUG-76879
Change-Id: Iaa2385aff2c13aa71a12e57385d9afb5dc60a073
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

1 files changed, 10 insertions, 14 deletions

diff --git a/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp b/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp
index 26bfd731e6..ae9ced909f 100644
--- a/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp
+++ b/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp
@@ -1396,29 +1396,25 @@ void tst_qqmlproperty::write()
     {
         PropertyObject o;
         QQmlProperty p(&o, "url");
+        const QUrl url = QUrl("main.qml");
 
-        QCOMPARE(p.write(QUrl("main.qml")), true);
-        QCOMPARE(o.url(), QUrl("main.qml"));
+        QCOMPARE(p.write(url), true);
+        QCOMPARE(o.url(), url);
 
         QQmlProperty p2(&o, "url", engine.rootContext());
 
-        QUrl result = engine.baseUrl().resolved(QUrl("main.qml"));
-        QVERIFY(result != QUrl("main.qml"));
-
-        QCOMPARE(p2.write(QUrl("main.qml")), true);
-        QCOMPARE(o.url(), result);
+        QCOMPARE(p2.write(url), true);
+        QCOMPARE(o.url(), url);
     }
     {   // static
         PropertyObject o;
+        const QUrl url = QUrl("main.qml");
 
-        QCOMPARE(QQmlProperty::write(&o, "url", QUrl("main.qml")), true);
-        QCOMPARE(o.url(), QUrl("main.qml"));
-
-        QUrl result = engine.baseUrl().resolved(QUrl("main.qml"));
-        QVERIFY(result != QUrl("main.qml"));
+        QCOMPARE(QQmlProperty::write(&o, "url", url), true);
+        QCOMPARE(o.url(), url);
 
-        QCOMPARE(QQmlProperty::write(&o, "url", QUrl("main.qml"), engine.rootContext()), true);
-        QCOMPARE(o.url(), result);
+        QCOMPARE(QQmlProperty::write(&o, "url", url, engine.rootContext()), true);
+        QCOMPARE(o.url(), url);
     }
 
     // Char/string-property