From cb6a3fe53e6a01cafed18fac9b1e5a64ebd834aa Mon Sep 17 00:00:00 2001 From: Ivan Solovev Date: Tue, 27 Aug 2024 18:24:02 +0200 Subject: [PATCH] QArgumentType: remove the incorrect noexcept from comparison operators The QArgumentType::name() getter evaluates the name lazily, which also involves constructing a QMetaType. It's not entirely clear if adding noexcept there is a good idea, so drop it. Amends 5a0faa9198c6ae6e21a550159c4284d1a9c5792e. Change-Id: I73042f22df9615f570823a7745f04e9731c097fe Reviewed-by: Marc Mutz Reviewed-by: Thiago Macieira (cherry picked from commit e39eb34bc6585c5ec367727e86f70ce67c2d176a) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/kernel/qmetaobject_p.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/kernel/qmetaobject_p.h b/src/corelib/kernel/qmetaobject_p.h index d5dc9a356a9..cc0be759d13 100644 --- a/src/corelib/kernel/qmetaobject_p.h +++ b/src/corelib/kernel/qmetaobject_p.h @@ -114,14 +114,14 @@ public: private: friend bool comparesEqual(const QArgumentType &lhs, - const QArgumentType &rhs) noexcept + const QArgumentType &rhs) { if (lhs._type && rhs._type) return lhs._type == rhs._type; else return lhs.name() == rhs.name(); } - Q_DECLARE_EQUALITY_COMPARABLE(QArgumentType) + Q_DECLARE_EQUALITY_COMPARABLE_NON_NOEXCEPT(QArgumentType) int _type; QByteArray _name;