Support URL resolution from within script blocks

1 files changed, 25 insertions, 0 deletions

diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp
index fdba79e..affb93b 100644
--- a/src/declarative/qml/qmlmetaproperty.cpp
+++ b/src/declarative/qml/qmlmetaproperty.cpp
@@ -874,6 +874,31 @@ void QmlMetaPropertyPrivate::writeValueProperty(const QVariant &value)
             }
             break;
 
+        case QVariant::Url:
+            {
+                QUrl u;
+                if (vt == QVariant::ByteArray) {
+                    u = QUrl(QLatin1String(value.toByteArray()));
+                    found = true;
+                } else if (QVariant::String) {
+                    u = QUrl(value.toString());
+                    found = true;
+                }
+
+                if (context && u.isRelative()) 
+                    u = context->baseUrl().resolved(u);
+
+                if (found) {
+                    void *a[1];
+                    a[0] = &u;
+                    QMetaObject::metacall(object, 
+                                          QMetaObject::WriteProperty,
+                                          coreIdx, a);
+                }
+
+            }
+            break;
+
 
         default:
             {