diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-01-27 13:24:30 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-01-27 16:51:07 +0100 |
| commit | 9b239b7fac12f04a5368cf8bf32a5e011c37d504 (patch) | |
| tree | c68d9e2a8e6a122548dfe773fde96a1114138136 /src/corelib/kernel/qproperty.h | |
| parent | 821af41cf212a269083231d46833a2366ed99326 (diff) | |
Q_OBJECT_BINDABLE_PROPERTY_WITH_ARGS: Silence warnings properly
Same reason as for the version without args. Amends
1461df2ce4ea0283759e653612208c8729a03d7a.
Change-Id: Ib9f0d8f27d858ff35134001c3cd7945b17668ae4
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'src/corelib/kernel/qproperty.h')
| -rw-r--r-- | src/corelib/kernel/qproperty.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/kernel/qproperty.h b/src/corelib/kernel/qproperty.h index 750d75c4a7..6672f270f4 100644 --- a/src/corelib/kernel/qproperty.h +++ b/src/corelib/kernel/qproperty.h @@ -1088,8 +1088,7 @@ private: #define Q_OBJECT_BINDABLE_PROPERTY_WITH_ARGS4(Class, Type, name, value) \ static constexpr size_t _qt_property_##name##_offset() \ { \ - QT_WARNING_PUSH QT_WARNING_DISABLE_INVALID_OFFSETOF return offsetof(Class, name); \ - QT_WARNING_POP \ + return offsetof(Class, name); \ } \ QObjectBindableProperty<Class, Type, Class::_qt_property_##name##_offset, nullptr> name = \ QObjectBindableProperty<Class, Type, Class::_qt_property_##name##_offset, nullptr>( \ @@ -1098,15 +1097,16 @@ private: #define Q_OBJECT_BINDABLE_PROPERTY_WITH_ARGS5(Class, Type, name, value, Signal) \ static constexpr size_t _qt_property_##name##_offset() \ { \ - QT_WARNING_PUSH QT_WARNING_DISABLE_INVALID_OFFSETOF return offsetof(Class, name); \ - QT_WARNING_POP \ + return offsetof(Class, name); \ } \ QObjectBindableProperty<Class, Type, Class::_qt_property_##name##_offset, Signal> name = \ QObjectBindableProperty<Class, Type, Class::_qt_property_##name##_offset, Signal>( \ value); #define Q_OBJECT_BINDABLE_PROPERTY_WITH_ARGS(...) \ - QT_OVERLOADED_MACRO(Q_OBJECT_BINDABLE_PROPERTY_WITH_ARGS, __VA_ARGS__) + QT_WARNING_PUSH QT_WARNING_DISABLE_INVALID_OFFSETOF \ + QT_OVERLOADED_MACRO(Q_OBJECT_BINDABLE_PROPERTY_WITH_ARGS, __VA_ARGS__) \ + QT_WARNING_POP template<typename Class, typename T, auto Offset, auto Getter> class QObjectComputedProperty : public QUntypedPropertyData |