summaryrefslogtreecommitdiffstats
path: root/src/corelib/compat
diff options
context:
space:
mode:
authorTatiana Borisova <tatiana.borisova@qt.io>2024-03-11 19:39:08 +0100
committerTatiana Borisova <tatiana.borisova@qt.io>2024-03-19 14:38:11 +0000
commit8ed8844343652e70a40d9d6d254296f139120427 (patch)
treeafd942537192aeb8fb548bde6c27ee9d57c2e84a /src/corelib/compat
parent5e81a17b224b8cda03704b045b437ba11726a744 (diff)
QCborArray: use new comparison helper macros
Replace public operators operator==(), operator!=(), operator<() of QCborArray to friend methods comparesEqual() / compareThreeWay(). Use QT_CORE_REMOVED_SINCE to get rid of current comparison methods and replace them with a friend. Delete #if 0 && __has_include(<compare>) blocks, since they are not required anymore. Add friend methods comparesEqual(QCborArray, QCborValueConstRef) and compareThreeWay(QCborArray, QCborValueConstRef) to QCborArray to support comparison between QCborArray and QCborValueRef/QCborValueConstRef, see test-case mapMutation(). Add QT_TEST_EQUALITY_OPS/QT_TEST_ALL_COMPARISON_OPS tests for QCborArray test-cases. Task-number: QTBUG-120300 Change-Id: Ifad1a04c61363618e8bba73cf7c87757552d722a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/compat')
-rw-r--r--src/corelib/compat/removed_api.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/compat/removed_api.cpp b/src/corelib/compat/removed_api.cpp
index e7b34ceec4..372b647bf0 100644
--- a/src/corelib/compat/removed_api.cpp
+++ b/src/corelib/compat/removed_api.cpp
@@ -932,6 +932,8 @@ QUrl QUrl::fromEncoded(const QByteArray &input, ParsingMode mode)
#include "qbytearray.h" // inlined API
+#include "qcborarray.h" // inlined API
+
#include "qcborvalue.h" // inlined API
#include "qdatastream.h" // inlined API