QtCore: Fix some macro clashes

The macro decode() in qurlquery.cpp clashes with the static helper
function decode() in qurlrecode.cpp. The macro encode() in
qurlquery.cpp clashes with QStringEncoder::encode().

Macro CBOR_ENCODER_WRITER_CONTROL is defined with various values
in 3rdparty/tinycbor and qcborstreamwriter.cpp.

Task-number: QTBUG-109394
Change-Id: I8fdf696863e5b1e6fb0c5607b2dd5b46427b9104
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit dc678299c8d38c11d1aa3f531e5d62dc2685bfa7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Friedemann Kleint 2023-01-26 13:49:55 +01:00 committed by Qt Cherry-pick Bot
parent e60a50286c
commit 4a8ea3e5b2
5 changed files with 16 additions and 0 deletions

View File

@ -817,3 +817,7 @@ void QUrlQuery::removeAllQueryItems(const QString &key)
\sa operator==() \sa operator==()
*/ */
QT_END_NAMESPACE QT_END_NAMESPACE
#undef decode
#undef leave
#undef encode

View File

@ -829,3 +829,7 @@ bool QCborStreamWriter::endMap()
} }
QT_END_NAMESPACE QT_END_NAMESPACE
#undef CBOR_ENCODER_WRITER_CONTROL
#undef CBOR_ENCODER_WRITE_FUNCTION
#undef CBOR_ENCODER_NO_CHECK_USER

View File

@ -5145,3 +5145,6 @@ size_t qHash(const QByteArray::FromBase64Result &key, size_t seed) noexcept
*/ */
QT_END_NAMESPACE QT_END_NAMESPACE
#undef IS_RAW_DATA
#undef REHASH

View File

@ -411,3 +411,5 @@ qsizetype QStaticByteArrayMatcherBase::indexOfIn(const char *needle, size_t nlen
QT_END_NAMESPACE QT_END_NAMESPACE
#undef REHASH

View File

@ -11243,3 +11243,6 @@ void QAbstractConcatenable::appendLatin1To(QLatin1StringView in, QChar *out) noe
*/ */
QT_END_NAMESPACE QT_END_NAMESPACE
#undef IS_RAW_DATA
#undef REHASH