diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/io/qurl.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/io/qurlquery.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index de67571053..319de070ee 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -505,7 +505,7 @@ recodeFromUser(const QString &input, const ushort *actions, int from, int to) const QChar *begin = input.constData() + from; const QChar *end = input.constData() + to; if (qt_urlRecode(output, begin, end, - QUrl::MostDecoded, actions)) + QUrl::DecodeReserved, actions)) return output; return input.mid(from, to - from); @@ -1021,7 +1021,7 @@ bool QUrlPrivate::setHost(const QString &value, int from, int iend, bool maybePe // check for percent-encoding first QString s; - if (maybePercentEncoded && qt_urlRecode(s, begin, end, QUrl::MostDecoded, 0)) { + if (maybePercentEncoded && qt_urlRecode(s, begin, end, QUrl::DecodeReserved, 0)) { // something was decoded // anything encoded left? if (s.contains(QChar(0x25))) { // '%' diff --git a/src/corelib/io/qurlquery.cpp b/src/corelib/io/qurlquery.cpp index 5625aebd3c..f5ba15a6e8 100644 --- a/src/corelib/io/qurlquery.cpp +++ b/src/corelib/io/qurlquery.cpp @@ -210,7 +210,7 @@ inline QString QUrlQueryPrivate::recodeFromUser(const QString &input) const // note: duplicated in setQuery() QString output; if (qt_urlRecode(output, input.constData(), input.constData() + input.length(), - QUrl::MostDecoded, + QUrl::DecodeReserved, prettyDecodedActions)) return output; return input; @@ -269,7 +269,7 @@ void QUrlQueryPrivate::setQuery(const QString &query) QString key; if (!qt_urlRecode(key, begin, delimiter, - QUrl::MostDecoded, + QUrl::DecodeReserved, prettyDecodedActions)) key = QString(begin, delimiter - begin); @@ -282,7 +282,7 @@ void QUrlQueryPrivate::setQuery(const QString &query) } else { QString value; if (!qt_urlRecode(value, delimiter + 1, pos, - QUrl::MostDecoded, + QUrl::DecodeReserved, prettyDecodedActions)) value = QString(delimiter + 1, pos - delimiter - 1); itemList.append(qMakePair(key, value)); |