diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-05-22 15:16:01 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-24 19:26:29 +0200 |
| commit | 7590ca03ced07f1a3e9d1aab30e6d5b239009ac4 (patch) | |
| tree | c1dcb68cfb3ada42b9eedaf75966c1abf657a32f /src/corelib/io | |
| parent | d92118231006d522da93d8a90fe8d6fce3378db8 (diff) | |
Ensure that no extra bits can leak into QUrl::toEncoded.
Technically, this function should take QUrl::UrlFormattingOptions, but
that doesn't exist. So we just mask out the high bits that determine
the encoding options. toEncoded only supports one encoding way: fully
encoded.
Change-Id: I1445ad7c292500921ec2672be4524d7d76a39f98
Reviewed-by: David Faure <faure@kde.org>
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qurl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index 6494590679..dc207d52fd 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -2486,7 +2486,7 @@ QString QUrl::toDisplayString(FormattingOptions options) const */ QByteArray QUrl::toEncoded(FormattingOptions options) const { - options &= ~DecodeReserved; + options &= ~(FullyDecoded | FullyEncoded); QString stringForm = toString(options | FullyEncoded); return stringForm.toLatin1(); } |