diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-01-26 13:49:55 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-01-31 18:42:15 +0100 |
| commit | dc678299c8d38c11d1aa3f531e5d62dc2685bfa7 (patch) | |
| tree | d2779f97c68fc0a426f8a09aba731c07bdddaeea | |
| parent | bd3d08267940844eeabc104c6e8c5ddaaa546457 (diff) | |
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>
| -rw-r--r-- | src/corelib/io/qurlquery.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/serialization/qcborstreamwriter.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/text/qbytearray.cpp | 3 | ||||
| -rw-r--r-- | src/corelib/text/qbytearraymatcher.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/text/qstring.cpp | 3 |
5 files changed, 16 insertions, 0 deletions
diff --git a/src/corelib/io/qurlquery.cpp b/src/corelib/io/qurlquery.cpp index b8a9bc598e..c707e8a2e6 100644 --- a/src/corelib/io/qurlquery.cpp +++ b/src/corelib/io/qurlquery.cpp @@ -817,3 +817,7 @@ void QUrlQuery::removeAllQueryItems(const QString &key) \sa operator==() */ QT_END_NAMESPACE + +#undef decode +#undef leave +#undef encode diff --git a/src/corelib/serialization/qcborstreamwriter.cpp b/src/corelib/serialization/qcborstreamwriter.cpp index 1842ed36fd..0e00fe9bd6 100644 --- a/src/corelib/serialization/qcborstreamwriter.cpp +++ b/src/corelib/serialization/qcborstreamwriter.cpp @@ -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 diff --git a/src/corelib/text/qbytearray.cpp b/src/corelib/text/qbytearray.cpp index c92ab16564..736f6fb192 100644 --- a/src/corelib/text/qbytearray.cpp +++ b/src/corelib/text/qbytearray.cpp @@ -5145,3 +5145,6 @@ size_t qHash(const QByteArray::FromBase64Result &key, size_t seed) noexcept */ QT_END_NAMESPACE + +#undef IS_RAW_DATA +#undef REHASH diff --git a/src/corelib/text/qbytearraymatcher.cpp b/src/corelib/text/qbytearraymatcher.cpp index 18f8c92c75..ae38fb584b 100644 --- a/src/corelib/text/qbytearraymatcher.cpp +++ b/src/corelib/text/qbytearraymatcher.cpp @@ -411,3 +411,5 @@ qsizetype QStaticByteArrayMatcherBase::indexOfIn(const char *needle, size_t nlen QT_END_NAMESPACE + +#undef REHASH diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp index c1cf0a9ec8..681b181451 100644 --- a/src/corelib/text/qstring.cpp +++ b/src/corelib/text/qstring.cpp @@ -9988,3 +9988,6 @@ void QAbstractConcatenable::appendLatin1To(QLatin1StringView in, QChar *out) noe */ QT_END_NAMESPACE + +#undef IS_RAW_DATA +#undef REHASH |