diff options
| author | Martin Jones <martin.jones@nokia.com> | 2012-04-19 18:07:32 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-19 11:05:50 +0200 |
| commit | 2ba80c7633ab2a24da2141536d5d6bec43d2cb86 (patch) | |
| tree | 01ea527c8c797a466e5cde823aef41f4c94ea7d0 /src/qml/qml/qqmlimport.cpp | |
| parent | 2e6718f219fcd8c272f3638f2cf135cf5c425824 (diff) | |
Make QML work with the new QUrl implementation.
Change-Id: Ie7a41670e467108ed68b67deb4987936465094a0
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'src/qml/qml/qqmlimport.cpp')
| -rw-r--r-- | src/qml/qml/qqmlimport.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp index be870cad4c..90228f170b 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(); |