Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

3 files changed, 3 insertions, 3 deletions

diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp
index bbcc64d..4f96d12 100644
--- a/src/declarative/qml/qmlcompiler.cpp
+++ b/src/declarative/qml/qmlcompiler.cpp
@@ -365,7 +365,7 @@ void QmlCompiler::genLiteralAssignment(const QMetaProperty &prop,
         case QVariant::Url:
             {
             instr.type = QmlInstruction::StoreUrl;
-            QUrl u = output->url.resolved(QUrl(string));
+            QUrl u = string.isEmpty() ? QUrl() : output->url.resolved(QUrl(string));
             instr.storeUrl.propertyIndex = prop.propertyIndex();
             instr.storeUrl.value = output->indexForString(u.toString());
             }
diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp
index 9e1deb0..c844a32 100644
--- a/src/declarative/qml/qmlcomponent.cpp
+++ b/src/declarative/qml/qmlcomponent.cpp
@@ -355,7 +355,7 @@ void QmlComponent::loadUrl(const QUrl &url)
 
     d->clear();
 
-    if (url.isRelative())
+    if (url.isRelative() && !url.isEmpty())
         d->url = d->engine->baseUrl().resolved(url);
     else
         d->url = url;
diff --git a/src/declarative/qml/qmlcontext.cpp b/src/declarative/qml/qmlcontext.cpp
index 61850c3..97ab375 100644
--- a/src/declarative/qml/qmlcontext.cpp
+++ b/src/declarative/qml/qmlcontext.cpp
@@ -422,7 +422,7 @@ void QmlContext::setContextProperty(const QString &name, QObject *value)
 QUrl QmlContext::resolvedUrl(const QUrl &src)
 {
     QmlContext *ctxt = this;
-    if (src.isRelative()) {
+    if (src.isRelative() && !src.isEmpty()) {
         if (ctxt) {
             while(ctxt) {
                 if(ctxt->d_func()->url.isValid())