Fix QUrl handling after QUrl changes.

toString() is fine for most usages but here the result is made part of XML
bits, so toEncoded() is necessary so that '<' and '>' are percent-encoded.

Change-Id: I41832cefe3ae12cab13531f17095d0804a2e86d9
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

2 files changed, 4 insertions, 3 deletions

diff --git a/src/xmlpatterns/data/qanyuri.cpp b/src/xmlpatterns/data/qanyuri.cpp
index 5d82baf..4a51364 100644
--- a/src/xmlpatterns/data/qanyuri.cpp
+++ b/src/xmlpatterns/data/qanyuri.cpp
@@ -60,14 +60,15 @@ AnyURI::Ptr AnyURI::fromValue(const QString &value)
 
 AnyURI::Ptr AnyURI::fromValue(const QUrl &uri)
 {
-    return AnyURI::Ptr(new AnyURI(uri.toString()));
+    return AnyURI::Ptr(new AnyURI(QString::fromLatin1(uri.toEncoded())));
 }
 
 AnyURI::Ptr AnyURI::resolveURI(const QString &relative,
                                const QString &base)
 {
     const QUrl urlBase(base);
-    return AnyURI::fromValue(urlBase.resolved(relative).toString());
+    const QUrl uri(urlBase.resolved(relative));
+    return AnyURI::fromValue(uri);
 }
 
 ItemType::Ptr AnyURI::type() const
diff --git a/src/xmlpatterns/data/qatomicvalue.cpp b/src/xmlpatterns/data/qatomicvalue.cpp
index c12bfa7..cc8f207 100644
--- a/src/xmlpatterns/data/qatomicvalue.cpp
+++ b/src/xmlpatterns/data/qatomicvalue.cpp
@@ -146,7 +146,7 @@ Item AtomicValue::toXDM(const QVariant &value)
              * have to let it be an xs:string. Calling QVariant::toString()
              * on a QVariant that contains a QUrl returns, surprisingly,
              * an empty string. */
-            return AtomicString::fromValue(value.toUrl().toString());
+            return AtomicString::fromValue(QString::fromLatin1(value.toUrl().toEncoded()));
         }
         case QVariant::ByteArray:
             return HexBinary::fromValue(value.toByteArray());