diff --git a/src/corelib/kernel/qproperty.h b/src/corelib/kernel/qproperty.h index d7d4593c09..20e7daf811 100644 --- a/src/corelib/kernel/qproperty.h +++ b/src/corelib/kernel/qproperty.h @@ -1015,21 +1015,20 @@ private: #define Q_OBJECT_BINDABLE_PROPERTY3(Class, Type, name) \ static constexpr size_t _qt_property_##name##_offset() { \ - QT_WARNING_PUSH QT_WARNING_DISABLE_INVALID_OFFSETOF \ return offsetof(Class, name); \ - QT_WARNING_POP \ } \ QObjectBindableProperty name; #define Q_OBJECT_BINDABLE_PROPERTY4(Class, Type, name, Signal) \ static constexpr size_t _qt_property_##name##_offset() { \ - QT_WARNING_PUSH QT_WARNING_DISABLE_INVALID_OFFSETOF \ return offsetof(Class, name); \ - QT_WARNING_POP \ } \ QObjectBindableProperty name; -#define Q_OBJECT_BINDABLE_PROPERTY(...) QT_OVERLOADED_MACRO(Q_OBJECT_BINDABLE_PROPERTY, __VA_ARGS__) +#define Q_OBJECT_BINDABLE_PROPERTY(...) \ + QT_WARNING_PUSH QT_WARNING_DISABLE_INVALID_OFFSETOF \ + QT_OVERLOADED_MACRO(Q_OBJECT_BINDABLE_PROPERTY, __VA_ARGS__) \ + QT_WARNING_POP #define Q_OBJECT_BINDABLE_PROPERTY_WITH_ARGS4(Class, Type, name, value) \ static constexpr size_t _qt_property_##name##_offset() \