From d06a686cad63474ddb2dfe4a4118c923c805e290 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 2 Dec 2021 22:06:32 +0100 Subject: Remove unused Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6 There are no users left in the tree. Change-Id: I336f4e15c0ec1f5933c1fcfa661bad85bd38ed35 Reviewed-by: Thiago Macieira --- src/corelib/global/qtypeinfo.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/corelib/global') diff --git a/src/corelib/global/qtypeinfo.h b/src/corelib/global/qtypeinfo.h index 7759eff370..96b52ca0b2 100644 --- a/src/corelib/global/qtypeinfo.h +++ b/src/corelib/global/qtypeinfo.h @@ -187,12 +187,6 @@ Q_DECLARE_TYPEINFO_BODY(QFlags, Q_PRIMITIVE_TYPE); where 'type' is the name of the type to specialize. NOTE: shared types must define a member-swap, and be defined in the same 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_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. */ #define Q_DECLARE_SHARED_IMPL(TYPE, FLAGS) \ @@ -201,8 +195,6 @@ 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_RELOCATABLE_TYPE) -#define Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(TYPE) \ - Q_DECLARE_SHARED_IMPL(TYPE, Q_RELOCATABLE_TYPE) namespace QTypeTraits { -- cgit v1.2.3