From 2ba80c7633ab2a24da2141536d5d6bec43d2cb86 Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Thu, 19 Apr 2012 18:07:32 +1000 Subject: [PATCH] Make QML work with the new QUrl implementation. Change-Id: Ie7a41670e467108ed68b67deb4987936465094a0 Reviewed-by: Jason McDonald --- src/qml/qml/qqmlimport.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp index be870ca..90228f1 100644 --- 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(); -- 2.7.4