diff options
Diffstat (limited to 'src/corelib/global/qtypeinfo.h')
| -rw-r--r-- | src/corelib/global/qtypeinfo.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/global/qtypeinfo.h b/src/corelib/global/qtypeinfo.h index f3382ea17e..e5914414f2 100644 --- a/src/corelib/global/qtypeinfo.h +++ b/src/corelib/global/qtypeinfo.h @@ -188,7 +188,7 @@ Q_DECLARE_TYPEINFO_BODY(QFlags<T>, Q_PRIMITIVE_TYPE); namespace as Qt for this to work. If the type was already released without Q_DECLARE_SHARED applied, - _and_ without an explicit Q_DECLARE_TYPEINFO(type, Q_MOVABLE_TYPE), + _and_ without an explicit Q_DECLARE_TYPEINFO(type, Q_RELOCATABLE_TYPE), then use Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(type) to mark the type shared (incl. swap()), without marking it movable (which would change the memory layout of QList, a BiC change. @@ -199,9 +199,9 @@ Q_DECLARE_TYPEINFO(TYPE, FLAGS); \ inline void swap(TYPE &value1, TYPE &value2) \ noexcept(noexcept(value1.swap(value2))) \ { value1.swap(value2); } -#define Q_DECLARE_SHARED(TYPE) Q_DECLARE_SHARED_IMPL(TYPE, Q_MOVABLE_TYPE) +#define Q_DECLARE_SHARED(TYPE) Q_DECLARE_SHARED_IMPL(TYPE, Q_RELOCATABLE_TYPE) #define Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(TYPE) \ - Q_DECLARE_SHARED_IMPL(TYPE, Q_MOVABLE_TYPE) + Q_DECLARE_SHARED_IMPL(TYPE, Q_RELOCATABLE_TYPE) namespace QTypeTraits { |