diff options
author | David Faure <faure@kde.org> | 2012-02-01 12:06:18 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-02 06:57:25 +0100 |
commit | 42db8b2df643ca46b5c096f8e0951ef158a9c687 (patch) | |
tree | 4fb0b14d2e89bc33e1a7c896c9c5af0dfe7a8c2d /tools | |
parent | f42f82f435d738339ad85c1380d1167338517247 (diff) | |
download | qtxmlpatterns-42db8b2df643ca46b5c096f8e0951ef158a9c687.tar.gz |
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>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/xmlpatterns/main.cpp | 2 | ||||
-rw-r--r-- | tools/xmlpatterns/qapplicationargumentparser.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/xmlpatterns/main.cpp b/tools/xmlpatterns/main.cpp index 8b661eb..171c6e5 100644 --- a/tools/xmlpatterns/main.cpp +++ b/tools/xmlpatterns/main.cpp @@ -222,7 +222,7 @@ static inline QUrl finalizeURI(const QApplicationArgumentParser &parser, const QString stringURI(parser.value(arg).toString()); if(parser.has(isURI)) - userURI = QUrl::fromEncoded(stringURI.toLatin1()); + userURI = QUrl(stringURI); else userURI = QUrl::fromLocalFile(stringURI); } diff --git a/tools/xmlpatterns/qapplicationargumentparser.cpp b/tools/xmlpatterns/qapplicationargumentparser.cpp index 04ff1df..0e2e4ed 100644 --- a/tools/xmlpatterns/qapplicationargumentparser.cpp +++ b/tools/xmlpatterns/qapplicationargumentparser.cpp @@ -833,7 +833,7 @@ QVariant QApplicationArgumentParser::convertToValue(const QApplicationArgument & } case QVariant::Url: { - const QUrl result(QUrl::fromEncoded(input.toLatin1())); + const QUrl result(input); if(result.isValid()) return QVariant(result); |