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. Pick-to: 6.5 Task-number: QTBUG-109394 Change-Id: I8fdf696863e5b1e6fb0c5607b2dd5b46427b9104 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>bb10
parent
bd3d082679
commit
dc678299c8
|
|
@ -817,3 +817,7 @@ void QUrlQuery::removeAllQueryItems(const QString &key)
|
|||
\sa operator==()
|
||||
*/
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#undef decode
|
||||
#undef leave
|
||||
#undef encode
|
||||
|
|
|
|||
|
|
@ -829,3 +829,7 @@ bool QCborStreamWriter::endMap()
|
|||
}
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#undef CBOR_ENCODER_WRITER_CONTROL
|
||||
#undef CBOR_ENCODER_WRITE_FUNCTION
|
||||
#undef CBOR_ENCODER_NO_CHECK_USER
|
||||
|
|
|
|||
|
|
@ -5145,3 +5145,6 @@ size_t qHash(const QByteArray::FromBase64Result &key, size_t seed) noexcept
|
|||
*/
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#undef IS_RAW_DATA
|
||||
#undef REHASH
|
||||
|
|
|
|||
|
|
@ -411,3 +411,5 @@ qsizetype QStaticByteArrayMatcherBase::indexOfIn(const char *needle, size_t nlen
|
|||
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#undef REHASH
|
||||
|
|
|
|||
|
|
@ -9988,3 +9988,6 @@ void QAbstractConcatenable::appendLatin1To(QLatin1StringView in, QChar *out) noe
|
|||
*/
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#undef IS_RAW_DATA
|
||||
#undef REHASH
|
||||
|
|
|
|||
Loading…
Reference in New Issue