Support URLs directly (not just as strings), so they are correctly resolved.

URLs expressed as strings (possible relative) are resolved relative to
the component in which the string expression is converted to a url value.
All items are converted to use QUrl properties, except SqlConnection, where
the databasename is only a special-case URL (this may need further consideration).

1 files changed, 3 insertions, 3 deletions

diff --git a/src/declarative/util/qmlscript.h b/src/declarative/util/qmlscript.h
index dc090bc..09ebc2c 100644
--- a/src/declarative/util/qmlscript.h
+++ b/src/declarative/util/qmlscript.h
@@ -58,7 +58,7 @@ class Q_DECLARATIVE_EXPORT QmlScript : public QObject
     Q_DECLARE_PRIVATE(QmlScript)
 
     Q_PROPERTY(QString script READ script WRITE setScript)
-    Q_PROPERTY(QString source READ source WRITE setSource)
+    Q_PROPERTY(QUrl source READ source WRITE setSource)
     Q_CLASSINFO("DefaultProperty", "script")
 
 public:
@@ -67,8 +67,8 @@ public:
     QString script() const;
     void setScript(const QString &);
 
-    QString source() const;
-    void setSource(const QString &);
+    QUrl source() const;
+    void setSource(const QUrl &);
 
 private Q_SLOTS:
     void replyFinished();