4 files changed, 10 insertions, 4 deletions
diff --git a/src/declarative/fx/qfxwebview.cpp b/src/declarative/fx/qfxwebview.cpp
index 4c1629e..04a4eef 100644
--- a/src/declarative/fx/qfxwebview.cpp
+++ b/src/declarative/fx/qfxwebview.cpp
@@ -325,6 +325,12 @@ QUrl QFxWebView::url() const
 
 void QFxWebView::setUrl(const QUrl &url)
 {
+    if (url.isEmpty()) {
+        // Make absolute.
+        setUrl(QUrl("about:blank"));
+        return;
+    }
+
     Q_D(QFxWebView);
     if (url == page()->mainFrame()->url())
         return;
@@ -333,7 +339,7 @@ void QFxWebView::setUrl(const QUrl &url)
         d->idealwidth>0 ? d->idealwidth : width(),
         d->idealheight>0 ? d->idealheight : height()));
 
-    Q_ASSERT(url.isEmpty() || !url.isRelative());
+    Q_ASSERT(!url.isRelative());
 
     if (isComponentComplete())
         page()->mainFrame()->load(url);
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 0e141da..e277d91 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())