Make QML work with the new QUrl implementation.

Change-Id: Ie7a41670e467108ed68b67deb4987936465094a0
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>

diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp
index be870ca..90228f1 100644 (file)
--- a/src/qml/qml/qqmlimport.cpp
+++ b/src/qml/qml/qqmlimport.cpp
@@ -63,6 +63,9 @@ static bool greaterThan(const QString &s1, const QString &s2)
 
 QString resolveLocalUrl(const QString &url, const QString &relative)
 {
+    return QUrl(url).resolved(QUrl(relative)).toString();
+
+    //XXX Find out why this broke with new QUrl.
     if (relative.contains(QLatin1Char(':'))) {
         // contains a host name
         return QUrl(url).resolved(QUrl(relative)).toString();