AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unused Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6

Browse Source 
There are no users left in the tree.

Change-Id: I336f4e15c0ec1f5933c1fcfa661bad85bd38ed35
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Marc Mutz 2021-12-02 22:06:32 +01:00
parent ac2f4bd9db
commit d06a686cad
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/global/qt-cpp-defines.qdocconf
View File

@ -186,7 +186,6 @@ Cpp.ignoredirectives += \
Q_DECLARE_PRIVATE_D \ Q_DECLARE_PRIVATE_D \
Q_DECLARE_PUBLIC \ Q_DECLARE_PUBLIC \
Q_DECLARE_SHARED \ Q_DECLARE_SHARED \
Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6 \
Q_DECLARE_TR_FUNCTIONS \ Q_DECLARE_TR_FUNCTIONS \
Q_DECLARE_TYPEINFO \ Q_DECLARE_TYPEINFO \
Q_DECL_NOEXCEPT_EXPR \ Q_DECL_NOEXCEPT_EXPR \

8
src/corelib/global/qtypeinfo.h
View File

@ -187,12 +187,6 @@ Q_DECLARE_TYPEINFO_BODY(QFlags<T>, Q_PRIMITIVE_TYPE);
where 'type' is the name of the type to specialize. NOTE: shared where 'type' is the name of the type to specialize. NOTE: shared
types must define a member-swap, and be defined in the same types must define a member-swap, and be defined in the same
namespace as Qt for this to work. 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) \ #define Q_DECLARE_SHARED_IMPL(TYPE, FLAGS) \
@ -201,8 +195,6 @@ inline void swap(TYPE &value1, TYPE &value2) \
noexcept(noexcept(value1.swap(value2))) \ noexcept(noexcept(value1.swap(value2))) \
{ value1.swap(value2); } { value1.swap(value2); }
#define Q_DECLARE_SHARED(TYPE) Q_DECLARE_SHARED_IMPL(TYPE, Q_RELOCATABLE_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_RELOCATABLE_TYPE)
namespace QTypeTraits namespace QTypeTraits
{ {