diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2024-08-27 18:24:02 +0200 |
|---|---|---|
| committer | Ivan Solovev <ivan.solovev@qt.io> | 2024-08-29 22:41:18 +0200 |
| commit | e39eb34bc6585c5ec367727e86f70ce67c2d176a (patch) | |
| tree | 87b338350f00dca9541fc7689f359c6c9f79ad66 | |
| parent | 02b436f2c5d7368827794e7ec1224419dca39e7f (diff) | |
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.
Pick-to: 6.8
Change-Id: I73042f22df9615f570823a7745f04e9731c097fe
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/corelib/kernel/qmetaobject_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qmetaobject_p.h b/src/corelib/kernel/qmetaobject_p.h index 56877579246..c2b716ac52d 100644 --- a/src/corelib/kernel/qmetaobject_p.h +++ b/src/corelib/kernel/qmetaobject_p.h @@ -61,14 +61,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; |