diff --git a/src/corelib/global/qtypeinfo.h b/src/corelib/global/qtypeinfo.h index b9159a2e1a6..4b29d0bf533 100644 --- a/src/corelib/global/qtypeinfo.h +++ b/src/corelib/global/qtypeinfo.h @@ -250,11 +250,14 @@ struct is_container struct has_operator_equal : std::false_type {}; template struct has_operator_equal() == std::declval()))>> : std::true_type {}; +QT_WARNING_POP // Two forward declarations template::value> diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 18d911d33b6..3b84327e911 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -2121,8 +2121,11 @@ struct BuiltinMetaType::IsBuiltIn>> template && !std::is_pointer_v)> struct QEqualityOperatorForType { +QT_WARNING_PUSH +QT_WARNING_DISABLE_FLOAT_COMPARE static bool equals(const QMetaTypeInterface *, const void *a, const void *b) { return *reinterpret_cast(a) == *reinterpret_cast(b); } +QT_WARNING_POP }; template