diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-03-30 10:31:37 -0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-11 23:31:59 +0200 |
| commit | 0441b2d4c332e0ae6e5ca52878985b826e8f68ca (patch) | |
| tree | 5bddf1fa3aa8712be806b0356101127654710047 /src/testlib/qtest.h | |
| parent | 9af551f7ab55d86ae0cca645bb7a86933b00d75c (diff) | |
Merge QUrl::DecodeAllDelimiters and QUrl::DecodeUnambiguousDelimiters
There's little value in having the DecodeUnambiguousDelimiters option
since neither QUrl nor QUrlQuery can return values that are ambiguous
in that particular context, ever.
This option could be used to encode a character if, when placed
in a URL, it would need to be encoded. Such cases are hash (#) or
question marks (?) in the path component, or slashes (/) and at signs
(@) in the userinfo.
However, we don't need two enums for that, since there are no
other characters that can appear in either form. Still, leave two bits
for this enum. In the future, if we want to split the gen-delims from
the sub-delims, we are able to.
Change-Id: If5416b524680eb67dd4abbe7d072ca0ef7218506
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Diffstat (limited to 'src/testlib/qtest.h')
| -rw-r--r-- | src/testlib/qtest.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/testlib/qtest.h b/src/testlib/qtest.h index 90705b3d40..d5d30d9003 100644 --- a/src/testlib/qtest.h +++ b/src/testlib/qtest.h @@ -142,7 +142,7 @@ template<> inline char *toString(const QRectF &s) template<> inline char *toString(const QUrl &uri) { - return qstrdup(uri.toEncoded(QUrl::DecodeUnambiguousDelimiters).constData()); + return qstrdup(uri.toEncoded(QUrl::DecodeDelimiters).constData()); } template<> inline char *toString(const QVariant &v) |