summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/corelib/io/qurlquery.cpp8
-rw-r--r--src/corelib/io/qurlquery.h6
2 files changed, 8 insertions, 6 deletions
diff --git a/src/corelib/io/qurlquery.cpp b/src/corelib/io/qurlquery.cpp
index 325a0c2ba3..b8a0d91332 100644
--- a/src/corelib/io/qurlquery.cpp
+++ b/src/corelib/io/qurlquery.cpp
@@ -768,18 +768,22 @@ void QUrlQuery::removeAllQueryItems(const QString &key)
}
/*!
- \fn QChar QUrlQuery::defaultQueryValueDelimiter()
+ \fn QUrlQuery::defaultQueryValueDelimiter()
Returns the default character for separating keys from values in the query,
an equal sign ("=").
+ \note Prior to Qt 6, this function returned QChar.
+
\sa setQueryDelimiters(), queryValueDelimiter(), defaultQueryPairDelimiter()
*/
/*!
- \fn QChar QUrlQuery::defaultQueryPairDelimiter()
+ \fn QUrlQuery::defaultQueryPairDelimiter()
Returns the default character for separating keys-value pairs from each
other, an ampersand ("&").
+ \note Prior to Qt 6, this function returned QChar.
+
\sa setQueryDelimiters(), queryPairDelimiter(), defaultQueryValueDelimiter()
*/
diff --git a/src/corelib/io/qurlquery.h b/src/corelib/io/qurlquery.h
index 0be2cafb0b..d91bd98e0d 100644
--- a/src/corelib/io/qurlquery.h
+++ b/src/corelib/io/qurlquery.h
@@ -102,10 +102,8 @@ public:
QStringList allQueryItemValues(const QString &key, QUrl::ComponentFormattingOptions encoding = QUrl::PrettyDecoded) const;
void removeAllQueryItems(const QString &key);
- static QChar defaultQueryValueDelimiter()
- { return QChar(ushort('=')); }
- static QChar defaultQueryPairDelimiter()
- { return QChar(ushort('&')); }
+ static constexpr char16_t defaultQueryValueDelimiter() noexcept { return u'='; }
+ static constexpr char16_t defaultQueryPairDelimiter() noexcept { return u'&'; }
private:
friend class QUrl;