From 30873cc720346bd91ee7fc9d45ff0faceb56f011 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 31 Mar 2022 11:34:18 +0200 Subject: [PATCH] Re-fix C++20 ambiguous relational operators after adding QJsonValueConstRef Change-Id: I573ffe2eb4a63b52a8e3982f6feb1b195913e538 Reviewed-by: Marc Mutz --- src/corelib/serialization/qjsonvalue.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/corelib/serialization/qjsonvalue.h b/src/corelib/serialization/qjsonvalue.h index 91241e4084..d1359c7a09 100644 --- a/src/corelib/serialization/qjsonvalue.h +++ b/src/corelib/serialization/qjsonvalue.h @@ -317,6 +317,16 @@ inline QJsonValue QCborValueConstRef::toJsonValue() const return concrete().toJsonValue(); } +inline bool operator==(const QJsonValueConstRef &lhs, const QJsonValueRef &rhs) +{ return QJsonValue(lhs) == QJsonValue(rhs); } +inline bool operator!=(const QJsonValueConstRef &lhs, const QJsonValueRef &rhs) +{ return !(lhs == rhs); } + +inline bool operator==(const QJsonValueRef &lhs, const QJsonValueConstRef &rhs) +{ return QJsonValue(lhs) == QJsonValue(rhs); } +inline bool operator!=(const QJsonValueRef &lhs, const QJsonValueConstRef &rhs) +{ return !(lhs == rhs); } + inline bool operator==(const QJsonValueRef &lhs, const QJsonValueRef &rhs) { return QJsonValue(lhs) == QJsonValue(rhs); } inline bool operator!=(const QJsonValueRef &lhs, const QJsonValueRef &rhs)