From 888f57107e698731c4a1dd2c46745c6293b2222e Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Thu, 9 Jul 2009 17:00:07 +1000
Subject: Allow relative URLs

---
 src/declarative/util/qmlscript.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/declarative/util/qmlscript.cpp b/src/declarative/util/qmlscript.cpp
index ab095b1..f8cbf96 100644
--- a/src/declarative/util/qmlscript.cpp
+++ b/src/declarative/util/qmlscript.cpp
@@ -148,9 +148,8 @@ void QmlScript::setSource(const QUrl &source)
     Q_D(QmlScript);
     if (d->url == source)
         return;
-    d->url = source;
-    Q_ASSERT(!source.isRelative());
-
+    d->url = qmlContext(this)->resolvedUrl(source);
+    
 #ifndef QT_NO_LOCALFILE_OPTIMIZED_QML
     if (d->url.scheme() == QLatin1String("file")) {
         QFile file(d->url.toLocalFile());
-- 
cgit v0.12