diff --git a/src/corelib/kernel/qsequentialiterable.h b/src/corelib/kernel/qsequentialiterable.h
@@ -180,9 +180,9 @@ inline QVariantRef<QSequentialIterator> &QVariantRef<QSequentialIterator>::opera
     return *this;
 }
 
-Q_DECLARE_TYPEINFO(QSequentialIterable, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(QSequentialIterable::iterator, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(QSequentialIterable::const_iterator, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QSequentialIterable, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(QSequentialIterable::iterator, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(QSequentialIterable::const_iterator, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 

diff --git a/src/corelib/serialization/qxmlstream.h b/src/corelib/serialization/qxmlstream.h
@@ -103,7 +103,7 @@ class Q_CORE_EXPORT QXmlStreamAttribute {
         { return !operator==(other); }
 };
 
-Q_DECLARE_TYPEINFO(QXmlStreamAttribute, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QXmlStreamAttribute, Q_RELOCATABLE_TYPE);
 
 // We export each out-of-line method invidually to prevent MSVC from
 // exporting the whole QList class.
@@ -154,7 +154,7 @@ class Q_CORE_EXPORT QXmlStreamNamespaceDeclaration {
         { return !operator==(other); }
 };
 
-Q_DECLARE_TYPEINFO(QXmlStreamNamespaceDeclaration, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QXmlStreamNamespaceDeclaration, Q_RELOCATABLE_TYPE);
 typedef QList<QXmlStreamNamespaceDeclaration> QXmlStreamNamespaceDeclarations;
 
 class Q_CORE_EXPORT QXmlStreamNotationDeclaration {
@@ -175,7 +175,7 @@ class Q_CORE_EXPORT QXmlStreamNotationDeclaration {
         { return !operator==(other); }
 };
 
-Q_DECLARE_TYPEINFO(QXmlStreamNotationDeclaration, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QXmlStreamNotationDeclaration, Q_RELOCATABLE_TYPE);
 typedef QList<QXmlStreamNotationDeclaration> QXmlStreamNotationDeclarations;
 
 class Q_CORE_EXPORT QXmlStreamEntityDeclaration {
@@ -201,7 +201,7 @@ class Q_CORE_EXPORT QXmlStreamEntityDeclaration {
         { return !operator==(other); }
 };
 
-Q_DECLARE_TYPEINFO(QXmlStreamEntityDeclaration, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QXmlStreamEntityDeclaration, Q_RELOCATABLE_TYPE);
 typedef QList<QXmlStreamEntityDeclaration> QXmlStreamEntityDeclarations;
 
 class Q_CORE_EXPORT QXmlStreamEntityResolver

diff --git a/src/corelib/text/qchar.h b/src/corelib/text/qchar.h
@@ -638,7 +638,7 @@ class Q_CORE_EXPORT QChar {
     char16_t ucs;
 };
 
-Q_DECLARE_TYPEINFO(QChar, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QChar, Q_RELOCATABLE_TYPE);
 
 #ifndef QT_NO_DATASTREAM
 Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, QChar);

diff --git a/src/corelib/text/qlocale_p.h b/src/corelib/text/qlocale_p.h
@@ -135,7 +135,7 @@ class Q_CORE_EXPORT QSystemLocale
     friend class QSystemLocaleSingleton;
 };
 Q_DECLARE_TYPEINFO(QSystemLocale::QueryType, Q_PRIMITIVE_TYPE);
-Q_DECLARE_TYPEINFO(QSystemLocale::CurrencyToStringArgument, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QSystemLocale::CurrencyToStringArgument, Q_RELOCATABLE_TYPE);
 #endif
 
 #if QT_CONFIG(icu)

diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp
@@ -4456,7 +4456,7 @@ class qt_section_chunk {
     qsizetype length;
     QStringView string;
 };
-Q_DECLARE_TYPEINFO(qt_section_chunk, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(qt_section_chunk, Q_RELOCATABLE_TYPE);
 
 static QString extractSections(const QList<qt_section_chunk> &sections, qsizetype start, qsizetype end,
                                QString::SectionFlags flags)

diff --git a/src/corelib/text/qstring.h b/src/corelib/text/qstring.h
@@ -311,7 +311,7 @@ class QLatin1String
     qsizetype m_size;
     const char *m_data;
 };
-Q_DECLARE_TYPEINFO(QLatin1String, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QLatin1String, Q_RELOCATABLE_TYPE);
 
 // Qt 4.x compatibility
 

diff --git a/src/corelib/thread/qthread_p.h b/src/corelib/thread/qthread_p.h
@@ -85,7 +85,7 @@ class QPostEvent
         : receiver(r), event(e), priority(p)
     { }
 };
-Q_DECLARE_TYPEINFO(QPostEvent, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QPostEvent, Q_RELOCATABLE_TYPE);
 
 inline bool operator<(const QPostEvent &first, const QPostEvent &second)
 {

diff --git a/src/corelib/time/qdatetime.h b/src/corelib/time/qdatetime.h
@@ -160,7 +160,7 @@ class Q_CORE_EXPORT QDate
     friend Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QDate &);
 #endif
 };
-Q_DECLARE_TYPEINFO(QDate, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QDate, Q_RELOCATABLE_TYPE);
 
 class Q_CORE_EXPORT QTime
 {
@@ -230,7 +230,7 @@ class Q_CORE_EXPORT QTime
     friend Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QTime &);
 #endif
 };
-Q_DECLARE_TYPEINFO(QTime, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QTime, Q_RELOCATABLE_TYPE);
 
 class QDateTimePrivate;
 

diff --git a/src/corelib/time/qtimezone.h b/src/corelib/time/qtimezone.h
@@ -171,7 +171,7 @@ class Q_CORE_EXPORT QTimeZone
     QSharedDataPointer<QTimeZonePrivate> d;
 };
 
-Q_DECLARE_TYPEINFO(QTimeZone::OffsetData, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QTimeZone::OffsetData, Q_RELOCATABLE_TYPE);
 Q_DECLARE_SHARED(QTimeZone)
 
 #ifndef QT_NO_DATASTREAM

diff --git a/src/corelib/time/qtimezoneprivate_p.h b/src/corelib/time/qtimezoneprivate_p.h
@@ -168,7 +168,7 @@ class Q_AUTOTEST_EXPORT QTimeZonePrivate : public QSharedData
 protected:
     QByteArray m_id;
 };
-Q_DECLARE_TYPEINFO(QTimeZonePrivate::Data, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QTimeZonePrivate::Data, Q_RELOCATABLE_TYPE);
 
 template<> QTimeZonePrivate *QSharedDataPointer<QTimeZonePrivate>::clone();
 

diff --git a/src/corelib/tools/qcommandlineparser.cpp b/src/corelib/tools/qcommandlineparser.cpp
@@ -126,7 +126,7 @@ class QCommandLineParserPrivate
     //! True if parse() needs to be called
     bool needsParsing;
 };
-Q_DECLARE_TYPEINFO(QCommandLineParserPrivate::PositionalArgumentDefinition, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QCommandLineParserPrivate::PositionalArgumentDefinition, Q_RELOCATABLE_TYPE);
 
 QStringList QCommandLineParserPrivate::aliases(const QString &optionName) const
 {

diff --git a/src/corelib/tools/qline.h b/src/corelib/tools/qline.h
@@ -89,7 +89,7 @@ class Q_CORE_EXPORT QLine
 private:
     QPoint pt1, pt2;
 };
-Q_DECLARE_TYPEINFO(QLine, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QLine, Q_RELOCATABLE_TYPE);
 
 /*******************************************************************************
  * class QLine inline members
@@ -274,7 +274,7 @@ class Q_CORE_EXPORT QLineF
 private:
     QPointF pt1, pt2;
 };
-Q_DECLARE_TYPEINFO(QLineF, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QLineF, Q_RELOCATABLE_TYPE);
 
 /*******************************************************************************
  * class QLineF inline members

diff --git a/src/corelib/tools/qmargins.h b/src/corelib/tools/qmargins.h
@@ -112,7 +112,7 @@ class QMargins
     }
 };
 
-Q_DECLARE_TYPEINFO(QMargins, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QMargins, Q_RELOCATABLE_TYPE);
 
 /*****************************************************************************
   QMargins stream functions
@@ -361,7 +361,7 @@ class QMarginsF
     }
 };
 
-Q_DECLARE_TYPEINFO(QMarginsF, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QMarginsF, Q_RELOCATABLE_TYPE);
 
 /*****************************************************************************
   QMarginsF stream functions

diff --git a/src/corelib/tools/qpoint.h b/src/corelib/tools/qpoint.h
@@ -129,7 +129,7 @@ class QPoint
     }
 };
 
-Q_DECLARE_TYPEINFO(QPoint, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QPoint, Q_RELOCATABLE_TYPE);
 
 /*****************************************************************************
   QPoint stream functions
@@ -323,7 +323,7 @@ class QPointF
     }
 };
 
-Q_DECLARE_TYPEINFO(QPointF, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QPointF, Q_RELOCATABLE_TYPE);
 
 /*****************************************************************************
   QPointF stream functions

diff --git a/src/corelib/tools/qrect.h b/src/corelib/tools/qrect.h
@@ -164,7 +164,7 @@ class Q_CORE_EXPORT QRect
     int x2;
     int y2;
 };
-Q_DECLARE_TYPEINFO(QRect, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRect, Q_RELOCATABLE_TYPE);
 
 
 /*****************************************************************************
@@ -625,7 +625,7 @@ class Q_CORE_EXPORT QRectF
     qreal w;
     qreal h;
 };
-Q_DECLARE_TYPEINFO(QRectF, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRectF, Q_RELOCATABLE_TYPE);
 
 
 /*****************************************************************************

diff --git a/src/corelib/tools/qringbuffer_p.h b/src/corelib/tools/qringbuffer_p.h
@@ -267,7 +267,7 @@ class QRingBuffer
 };
 
 Q_DECLARE_SHARED(QRingChunk)
-Q_DECLARE_TYPEINFO(QRingBuffer, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRingBuffer, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 

diff --git a/src/corelib/tools/qshareddata.h b/src/corelib/tools/qshareddata.h
@@ -293,8 +293,8 @@ size_t qHash(const QExplicitlySharedDataPointer<T> &ptr, size_t seed = 0) noexce
     return qHash(ptr.data(), seed);
 }
 
-template<typename T> Q_DECLARE_TYPEINFO_BODY(QSharedDataPointer<T>, Q_MOVABLE_TYPE);
-template<typename T> Q_DECLARE_TYPEINFO_BODY(QExplicitlySharedDataPointer<T>, Q_MOVABLE_TYPE);
+template<typename T> Q_DECLARE_TYPEINFO_BODY(QSharedDataPointer<T>, Q_RELOCATABLE_TYPE);
+template<typename T> Q_DECLARE_TYPEINFO_BODY(QExplicitlySharedDataPointer<T>, Q_RELOCATABLE_TYPE);
 
 #define QT_DECLARE_QSDP_SPECIALIZATION_DTOR(Class) \
     template<> QSharedDataPointer<Class>::~QSharedDataPointer();

diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h
@@ -946,8 +946,8 @@ std::shared_ptr<X> qSharedPointerObjectCast(std::shared_ptr<T> &&src)
 
 #endif
 
-template<typename T> Q_DECLARE_TYPEINFO_BODY(QWeakPointer<T>, Q_MOVABLE_TYPE);
-template<typename T> Q_DECLARE_TYPEINFO_BODY(QSharedPointer<T>, Q_MOVABLE_TYPE);
+template<typename T> Q_DECLARE_TYPEINFO_BODY(QWeakPointer<T>, Q_RELOCATABLE_TYPE);
+template<typename T> Q_DECLARE_TYPEINFO_BODY(QSharedPointer<T>, Q_RELOCATABLE_TYPE);
 
 
 QT_END_NAMESPACE

diff --git a/src/corelib/tools/qsize.h b/src/corelib/tools/qsize.h
@@ -113,7 +113,7 @@ class Q_CORE_EXPORT QSize
     int wd;
     int ht;
 };
-Q_DECLARE_TYPEINFO(QSize, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QSize, Q_RELOCATABLE_TYPE);
 
 /*****************************************************************************
   QSize stream functions
@@ -290,7 +290,7 @@ class Q_CORE_EXPORT QSizeF
     qreal wd;
     qreal ht;
 };
-Q_DECLARE_TYPEINFO(QSizeF, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QSizeF, Q_RELOCATABLE_TYPE);
 
 
 /*****************************************************************************

diff --git a/src/corelib/tools/qversionnumber.h b/src/corelib/tools/qversionnumber.h
@@ -303,7 +303,7 @@ class QVersionNumber
     friend Q_CORE_EXPORT size_t qHash(const QVersionNumber &key, size_t seed);
 };
 
-Q_DECLARE_TYPEINFO(QVersionNumber, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QVersionNumber, Q_RELOCATABLE_TYPE);
 
 #ifndef QT_NO_DEBUG_STREAM
 Q_CORE_EXPORT QDebug operator<<(QDebug, const QVersionNumber &version);
@@ -454,7 +454,7 @@ class QTypeRevision
 };
 
 static_assert(sizeof(QTypeRevision) == 2);
-Q_DECLARE_TYPEINFO(QTypeRevision, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QTypeRevision, Q_RELOCATABLE_TYPE);
 
 #ifndef QT_NO_DEBUG_STREAM
 Q_CORE_EXPORT QDebug operator<<(QDebug, const QTypeRevision &revision);

diff --git a/src/gui/accessible/linux/qspi_struct_marshallers_p.h b/src/gui/accessible/linux/qspi_struct_marshallers_p.h
@@ -76,7 +76,7 @@ struct QSpiObjectReference
     QSpiObjectReference(const QDBusConnection& connection, const QDBusObjectPath& path)
         : service(connection.baseService()), path(path) {}
 };
-Q_DECLARE_TYPEINFO(QSpiObjectReference, Q_MOVABLE_TYPE); // QDBusObjectPath is movable, even though it
+Q_DECLARE_TYPEINFO(QSpiObjectReference, Q_RELOCATABLE_TYPE); // QDBusObjectPath is movable, even though it
                                                          // cannot be marked that way until Qt 6
 
 QDBusArgument &operator<<(QDBusArgument &argument, const QSpiObjectReference &address);
@@ -96,7 +96,7 @@ struct QSpiAccessibleCacheItem
     QString                     description;
     QSpiUIntList                state;
 };
-Q_DECLARE_TYPEINFO(QSpiAccessibleCacheItem, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QSpiAccessibleCacheItem, Q_RELOCATABLE_TYPE);
 
 typedef QList<QSpiAccessibleCacheItem> QSpiAccessibleCacheArray;
 
@@ -109,7 +109,7 @@ struct QSpiAction
     QString description;
     QString keyBinding;
 };
-Q_DECLARE_TYPEINFO(QSpiAction, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QSpiAction, Q_RELOCATABLE_TYPE);
 
 typedef QList<QSpiAction> QSpiActionArray;
 
@@ -121,7 +121,7 @@ struct QSpiEventListener
     QString listenerAddress;
     QString eventName;
 };
-Q_DECLARE_TYPEINFO(QSpiEventListener, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QSpiEventListener, Q_RELOCATABLE_TYPE);
 
 typedef QList<QSpiEventListener> QSpiEventListenerArray;
 
@@ -138,7 +138,7 @@ struct QSpiTextRange {
     QString contents;
     QVariant v;
 };
-Q_DECLARE_TYPEINFO(QSpiTextRange, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QSpiTextRange, Q_RELOCATABLE_TYPE);
 
 typedef QList<QSpiTextRange> QSpiTextRangeList;
 typedef QMap <QString, QString> QSpiAttributeSet;
@@ -153,7 +153,7 @@ struct QSpiAppUpdate {
     int type; /* Is an application added or removed */
     QString address; /* D-Bus address of application added or removed */
 };
-Q_DECLARE_TYPEINFO(QSpiAppUpdate, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QSpiAppUpdate, Q_RELOCATABLE_TYPE);
 
 QDBusArgument &operator<<(QDBusArgument &argument, const QSpiAppUpdate &update);
 const QDBusArgument &operator>>(const QDBusArgument &argument, QSpiAppUpdate &update);
@@ -167,7 +167,7 @@ struct QSpiDeviceEvent {
     QString text;
     bool isText;
 };
-Q_DECLARE_TYPEINFO(QSpiDeviceEvent, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QSpiDeviceEvent, Q_RELOCATABLE_TYPE);
 
 QDBusArgument &operator<<(QDBusArgument &argument, const QSpiDeviceEvent &event);
 const QDBusArgument &operator>>(const QDBusArgument &argument, QSpiDeviceEvent &event);

diff --git a/src/gui/image/qicon_p.h b/src/gui/image/qicon_p.h
@@ -97,7 +97,7 @@ struct QPixmapIconEngineEntry
     QIcon::State state;
     bool isNull() const {return (fileName.isEmpty() && pixmap.isNull()); }
 };
-Q_DECLARE_TYPEINFO(QPixmapIconEngineEntry, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QPixmapIconEngineEntry, Q_RELOCATABLE_TYPE);
 
 inline QPixmapIconEngineEntry::QPixmapIconEngineEntry(const QString &file, const QImage &image, QIcon::Mode m, QIcon::State s)
     : fileName(file), size(image.size()), scale(image.devicePixelRatio()), mode(m), state(s)

diff --git a/src/gui/image/qiconloader_p.h b/src/gui/image/qiconloader_p.h
@@ -86,7 +86,7 @@ struct QIconDirInfo
     short scale;
     Type type;
 };
-Q_DECLARE_TYPEINFO(QIconDirInfo, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QIconDirInfo, Q_RELOCATABLE_TYPE);
 
 class QIconLoaderEngineEntry
  {

diff --git a/src/gui/image/qmovie.cpp b/src/gui/image/qmovie.cpp
@@ -220,7 +220,7 @@ class QFrameInfo
     static inline QFrameInfo endMarker()
     { return QFrameInfo(true); }
 };
-Q_DECLARE_TYPEINFO(QFrameInfo, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QFrameInfo, Q_RELOCATABLE_TYPE);
 
 class QMoviePrivate : public QObjectPrivate
 {

diff --git a/src/gui/itemmodels/qfilesystemmodel_p.h b/src/gui/itemmodels/qfilesystemmodel_p.h
@@ -82,7 +82,7 @@ class QFileSystemModelNodePathKey : public QString
     bool operator==(const QFileSystemModelNodePathKey &other) const { return !compare(other, Qt::CaseInsensitive); }
 };
 
-Q_DECLARE_TYPEINFO(QFileSystemModelNodePathKey, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QFileSystemModelNodePathKey, Q_RELOCATABLE_TYPE);
 
 inline size_t qHash(const QFileSystemModelNodePathKey &key) { return qHash(key.toCaseFolded()); }
 #else // Q_OS_WIN
@@ -316,7 +316,7 @@ class Q_GUI_EXPORT QFileSystemModelPrivate : public QAbstractItemModelPrivate
     // not recursive, meaning we sort only what we see.
     bool disableRecursiveSort = false;
 };
-Q_DECLARE_TYPEINFO(QFileSystemModelPrivate::Fetching, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QFileSystemModelPrivate::Fetching, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 

diff --git a/src/gui/itemmodels/qstandarditemmodel_p.h b/src/gui/itemmodels/qstandarditemmodel_p.h
@@ -74,7 +74,7 @@ class QStandardItemData
     QVariant value;
     inline bool operator==(const QStandardItemData &other) const { return role == other.role && value == other.value; }
 };
-Q_DECLARE_TYPEINFO(QStandardItemData, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QStandardItemData, Q_RELOCATABLE_TYPE);
 
 #ifndef QT_NO_DATASTREAM
 

diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h
@@ -721,7 +721,7 @@ class Q_GUI_EXPORT QInputMethodEvent : public QEvent
     int m_replacementStart;
     int m_replacementLength;
 };
-Q_DECLARE_TYPEINFO(QInputMethodEvent::Attribute, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QInputMethodEvent::Attribute, Q_RELOCATABLE_TYPE);
 
 class Q_GUI_EXPORT QInputMethodQueryEvent : public QEvent
 {
@@ -745,7 +745,7 @@ class Q_GUI_EXPORT QInputMethodQueryEvent : public QEvent
     friend QTypeInfo<QueryPair>;
     QList<QueryPair> m_values;
 };
-Q_DECLARE_TYPEINFO(QInputMethodQueryEvent::QueryPair, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QInputMethodQueryEvent::QueryPair, Q_RELOCATABLE_TYPE);
 
 #endif // QT_NO_INPUTMETHOD
 

diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
@@ -1059,7 +1059,7 @@ struct QModifKeyName {
     int qt_key;
     QString name;
 };
-Q_DECLARE_TYPEINFO(QModifKeyName, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QModifKeyName, Q_RELOCATABLE_TYPE);
 
 Q_GLOBAL_STATIC(QList<QModifKeyName>, globalModifs)
 Q_GLOBAL_STATIC(QList<QModifKeyName>, globalPortableModifs)

diff --git a/src/gui/kernel/qpointingdevice.h b/src/gui/kernel/qpointingdevice.h
@@ -79,7 +79,7 @@ class Q_GUI_EXPORT QPointingDeviceUniqueId
     // In this case, m_numericId will then turn into an index into that array (or hash).
     qint64 m_numericId;
 };
-Q_DECLARE_TYPEINFO(QPointingDeviceUniqueId, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QPointingDeviceUniqueId, Q_RELOCATABLE_TYPE);
 
 Q_GUI_EXPORT size_t qHash(QPointingDeviceUniqueId key, size_t seed = 0) noexcept;
 

diff --git a/src/gui/kernel/qshortcutmap.cpp b/src/gui/kernel/qshortcutmap.cpp
@@ -87,7 +87,7 @@ struct QShortcutEntry
     QObject *owner;
     QShortcutMap::ContextMatcher contextMatcher;
 };
-Q_DECLARE_TYPEINFO(QShortcutEntry, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QShortcutEntry, Q_RELOCATABLE_TYPE);
 
 #ifdef Dump_QShortcutMap
 /*! \internal

diff --git a/src/gui/math3d/qmatrix4x4.h b/src/gui/math3d/qmatrix4x4.h
@@ -213,7 +213,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QMatrix4x4::Flags)
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_FLOAT_COMPARE
 
-Q_DECLARE_TYPEINFO(QMatrix4x4, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QMatrix4x4, Q_RELOCATABLE_TYPE);
 
 inline QMatrix4x4::QMatrix4x4
         (float m11, float m12, float m13, float m14,

diff --git a/src/gui/math3d/qquaternion.h b/src/gui/math3d/qquaternion.h
@@ -169,7 +169,7 @@ QT_WARNING_POP
     float wp, xp, yp, zp;
 };
 
-Q_DECLARE_TYPEINFO(QQuaternion, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QQuaternion, Q_RELOCATABLE_TYPE);
 
 inline QQuaternion::QQuaternion() : wp(1.0f), xp(0.0f), yp(0.0f), zp(0.0f) {}
 

diff --git a/src/gui/painting/qcolor.h b/src/gui/painting/qcolor.h
@@ -297,7 +297,7 @@ class Q_GUI_EXPORT QColor
         : cspec(spec), ct(a1, a2, a3, a4, a5) {}
 #endif // Q_COMPILER_UNIFORM_INIT
 };
-Q_DECLARE_TYPEINFO(QColor, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QColor, Q_RELOCATABLE_TYPE);
 
 inline QColor::QColor(QLatin1String aname)
 { setNamedColor(aname); }

diff --git a/src/gui/painting/qpageranges.h b/src/gui/painting/qpageranges.h
@@ -116,7 +116,7 @@ Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QPageRanges &pageRanges);
 #endif
 
 Q_DECLARE_SHARED(QPageRanges)
-Q_DECLARE_TYPEINFO(QPageRanges::Range, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QPageRanges::Range, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 

diff --git a/src/gui/painting/qpainter_p.h b/src/gui/painting/qpainter_p.h
@@ -140,7 +140,7 @@ class QPainterClipInfo
 
 };
 
-Q_DECLARE_TYPEINFO(QPainterClipInfo, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QPainterClipInfo, Q_RELOCATABLE_TYPE);
 
 class Q_GUI_EXPORT QPainterState : public QPaintEngineState
 {

diff --git a/src/gui/painting/qplatformbackingstore.cpp b/src/gui/painting/qplatformbackingstore.cpp
@@ -80,7 +80,7 @@ struct QBackingstoreTextureInfo
     QPlatformTextureList::Flags flags;
 };
 
-Q_DECLARE_TYPEINFO(QBackingstoreTextureInfo, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QBackingstoreTextureInfo, Q_RELOCATABLE_TYPE);
 
 class QPlatformTextureListPrivate : public QObjectPrivate
 {

diff --git a/src/gui/painting/qtransform.h b/src/gui/painting/qtransform.h
@@ -177,7 +177,7 @@ class Q_GUI_EXPORT QTransform
     mutable uint m_type : 5;
     mutable uint m_dirty : 5;
 };
-Q_DECLARE_TYPEINFO(QTransform, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QTransform, Q_RELOCATABLE_TYPE);
 
 Q_GUI_EXPORT Q_DECL_CONST_FUNCTION size_t qHash(const QTransform &key, size_t seed = 0) noexcept;
 

diff --git a/src/gui/platform/unix/dbusmenu/qdbusmenutypes_p.h b/src/gui/platform/unix/dbusmenu/qdbusmenutypes_p.h
@@ -82,7 +82,7 @@ class QDBusMenuItem
     int m_id;
     QVariantMap m_properties;
 };
-Q_DECLARE_TYPEINFO(QDBusMenuItem, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QDBusMenuItem, Q_RELOCATABLE_TYPE);
 
 const QDBusArgument &operator<<(QDBusArgument &arg, const QDBusMenuItem &item);
 const QDBusArgument &operator>>(const QDBusArgument &arg, QDBusMenuItem &item);
@@ -94,7 +94,7 @@ class QDBusMenuItemKeys
     int id;
     QStringList properties;
 };
-Q_DECLARE_TYPEINFO(QDBusMenuItemKeys, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QDBusMenuItemKeys, Q_RELOCATABLE_TYPE);
 
 const QDBusArgument &operator<<(QDBusArgument &arg, const QDBusMenuItemKeys &keys);
 const QDBusArgument &operator>>(const QDBusArgument &arg, QDBusMenuItemKeys &keys);
@@ -112,7 +112,7 @@ class QDBusMenuLayoutItem
     QVariantMap m_properties;
     QList<QDBusMenuLayoutItem> m_children;
 };
-Q_DECLARE_TYPEINFO(QDBusMenuLayoutItem, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QDBusMenuLayoutItem, Q_RELOCATABLE_TYPE);
 
 const QDBusArgument &operator<<(QDBusArgument &arg, const QDBusMenuLayoutItem &);
 const QDBusArgument &operator>>(const QDBusArgument &arg, QDBusMenuLayoutItem &item);
@@ -127,7 +127,7 @@ class QDBusMenuEvent
     QDBusVariant m_data;
     uint m_timestamp;
 };
-Q_DECLARE_TYPEINFO(QDBusMenuEvent, Q_MOVABLE_TYPE); // QDBusVariant is movable, even though it cannot
+Q_DECLARE_TYPEINFO(QDBusMenuEvent, Q_RELOCATABLE_TYPE); // QDBusVariant is movable, even though it cannot
                                                     // be marked as such until Qt 6.
 
 const QDBusArgument &operator<<(QDBusArgument &arg, const QDBusMenuEvent &ev);

diff --git a/src/gui/platform/unix/dbustray/qdbustraytypes_p.h b/src/gui/platform/unix/dbustray/qdbustraytypes_p.h
@@ -75,7 +75,7 @@ struct QXdgDBusImageStruct
     int height;
     QByteArray data;
 };
-Q_DECLARE_TYPEINFO(QXdgDBusImageStruct, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QXdgDBusImageStruct, Q_RELOCATABLE_TYPE);
 
 using QXdgDBusImageVector = QList<QXdgDBusImageStruct>;
 
@@ -89,7 +89,7 @@ struct QXdgDBusToolTipStruct
     QString title;
     QString subTitle;
 };
-Q_DECLARE_TYPEINFO(QXdgDBusToolTipStruct, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QXdgDBusToolTipStruct, Q_RELOCATABLE_TYPE);
 
 const QDBusArgument &operator<<(QDBusArgument &argument, const QXdgDBusImageStruct &icon);
 const QDBusArgument &operator>>(const QDBusArgument &argument, QXdgDBusImageStruct &icon);

diff --git a/src/gui/rhi/qrhi_p.h b/src/gui/rhi/qrhi_p.h
@@ -90,7 +90,7 @@ class Q_GUI_EXPORT QRhiDepthStencilClearValue
     quint32 m_s = 0;
 };
 
-Q_DECLARE_TYPEINFO(QRhiDepthStencilClearValue, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiDepthStencilClearValue, Q_RELOCATABLE_TYPE);
 
 Q_GUI_EXPORT bool operator==(const QRhiDepthStencilClearValue &a, const QRhiDepthStencilClearValue &b) noexcept;
 Q_GUI_EXPORT bool operator!=(const QRhiDepthStencilClearValue &a, const QRhiDepthStencilClearValue &b) noexcept;
@@ -122,7 +122,7 @@ class Q_GUI_EXPORT QRhiViewport
     float m_maxDepth = 1.0f;
 };
 
-Q_DECLARE_TYPEINFO(QRhiViewport, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiViewport, Q_RELOCATABLE_TYPE);
 
 Q_GUI_EXPORT bool operator==(const QRhiViewport &a, const QRhiViewport &b) noexcept;
 Q_GUI_EXPORT bool operator!=(const QRhiViewport &a, const QRhiViewport &b) noexcept;
@@ -146,7 +146,7 @@ class Q_GUI_EXPORT QRhiScissor
     std::array<int, 4> m_rect { { 0, 0, 0, 0 } };
 };
 
-Q_DECLARE_TYPEINFO(QRhiScissor, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiScissor, Q_RELOCATABLE_TYPE);
 
 Q_GUI_EXPORT bool operator==(const QRhiScissor &a, const QRhiScissor &b) noexcept;
 Q_GUI_EXPORT bool operator!=(const QRhiScissor &a, const QRhiScissor &b) noexcept;
@@ -181,7 +181,7 @@ class Q_GUI_EXPORT QRhiVertexInputBinding
     int m_instanceStepRate = 1;
 };
 
-Q_DECLARE_TYPEINFO(QRhiVertexInputBinding, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiVertexInputBinding, Q_RELOCATABLE_TYPE);
 
 Q_GUI_EXPORT bool operator==(const QRhiVertexInputBinding &a, const QRhiVertexInputBinding &b) noexcept;
 Q_GUI_EXPORT bool operator!=(const QRhiVertexInputBinding &a, const QRhiVertexInputBinding &b) noexcept;
@@ -237,7 +237,7 @@ class Q_GUI_EXPORT QRhiVertexInputAttribute
     int m_matrixSlice = -1;
 };
 
-Q_DECLARE_TYPEINFO(QRhiVertexInputAttribute, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiVertexInputAttribute, Q_RELOCATABLE_TYPE);
 
 Q_GUI_EXPORT bool operator==(const QRhiVertexInputAttribute &a, const QRhiVertexInputAttribute &b) noexcept;
 Q_GUI_EXPORT bool operator!=(const QRhiVertexInputAttribute &a, const QRhiVertexInputAttribute &b) noexcept;
@@ -281,7 +281,7 @@ class Q_GUI_EXPORT QRhiVertexInputLayout
     friend Q_GUI_EXPORT QDebug operator<<(QDebug, const QRhiVertexInputLayout &);
 };
 
-Q_DECLARE_TYPEINFO(QRhiVertexInputLayout, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiVertexInputLayout, Q_RELOCATABLE_TYPE);
 
 Q_GUI_EXPORT bool operator==(const QRhiVertexInputLayout &a, const QRhiVertexInputLayout &b) noexcept;
 Q_GUI_EXPORT bool operator!=(const QRhiVertexInputLayout &a, const QRhiVertexInputLayout &b) noexcept;
@@ -318,7 +318,7 @@ class Q_GUI_EXPORT QRhiShaderStage
     QShader::Variant m_shaderVariant = QShader::StandardShader;
 };
 
-Q_DECLARE_TYPEINFO(QRhiShaderStage, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiShaderStage, Q_RELOCATABLE_TYPE);
 
 Q_GUI_EXPORT bool operator==(const QRhiShaderStage &a, const QRhiShaderStage &b) noexcept;
 Q_GUI_EXPORT bool operator!=(const QRhiShaderStage &a, const QRhiShaderStage &b) noexcept;
@@ -466,7 +466,7 @@ class Q_GUI_EXPORT QRhiColorAttachment
     int m_resolveLevel = 0;
 };
 
-Q_DECLARE_TYPEINFO(QRhiColorAttachment, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiColorAttachment, Q_RELOCATABLE_TYPE);
 
 class Q_GUI_EXPORT QRhiTextureRenderTargetDescription
 {
@@ -499,7 +499,7 @@ class Q_GUI_EXPORT QRhiTextureRenderTargetDescription
     QRhiTexture *m_depthTexture = nullptr;
 };
 
-Q_DECLARE_TYPEINFO(QRhiTextureRenderTargetDescription, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiTextureRenderTargetDescription, Q_RELOCATABLE_TYPE);
 
 class Q_GUI_EXPORT QRhiTextureSubresourceUploadDescription
 {
@@ -531,7 +531,7 @@ class Q_GUI_EXPORT QRhiTextureSubresourceUploadDescription
     QPoint m_sourceTopLeft;
 };
 
-Q_DECLARE_TYPEINFO(QRhiTextureSubresourceUploadDescription, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiTextureSubresourceUploadDescription, Q_RELOCATABLE_TYPE);
 
 class Q_GUI_EXPORT QRhiTextureUploadEntry
 {
@@ -554,7 +554,7 @@ class Q_GUI_EXPORT QRhiTextureUploadEntry
     QRhiTextureSubresourceUploadDescription m_desc;
 };
 
-Q_DECLARE_TYPEINFO(QRhiTextureUploadEntry, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiTextureUploadEntry, Q_RELOCATABLE_TYPE);
 
 class Q_GUI_EXPORT QRhiTextureUploadDescription
 {
@@ -577,7 +577,7 @@ class Q_GUI_EXPORT QRhiTextureUploadDescription
     QVarLengthArray<QRhiTextureUploadEntry, 16> m_entries;
 };
 
-Q_DECLARE_TYPEINFO(QRhiTextureUploadDescription, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiTextureUploadDescription, Q_RELOCATABLE_TYPE);
 
 class Q_GUI_EXPORT QRhiTextureCopyDescription
 {
@@ -615,7 +615,7 @@ class Q_GUI_EXPORT QRhiTextureCopyDescription
     QPoint m_destinationTopLeft;
 };
 
-Q_DECLARE_TYPEINFO(QRhiTextureCopyDescription, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiTextureCopyDescription, Q_RELOCATABLE_TYPE);
 
 class Q_GUI_EXPORT QRhiReadbackDescription
 {
@@ -638,7 +638,7 @@ class Q_GUI_EXPORT QRhiReadbackDescription
     int m_level = 0;
 };
 
-Q_DECLARE_TYPEINFO(QRhiReadbackDescription, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiReadbackDescription, Q_RELOCATABLE_TYPE);
 
 struct Q_GUI_EXPORT QRhiNativeHandles
 {
@@ -1249,7 +1249,7 @@ class Q_GUI_EXPORT QRhiGraphicsPipeline : public QRhiResource
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QRhiGraphicsPipeline::Flags)
 Q_DECLARE_OPERATORS_FOR_FLAGS(QRhiGraphicsPipeline::ColorMask)
-Q_DECLARE_TYPEINFO(QRhiGraphicsPipeline::TargetBlend, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiGraphicsPipeline::TargetBlend, Q_RELOCATABLE_TYPE);
 
 class Q_GUI_EXPORT QRhiSwapChain : public QRhiResource
 {

diff --git a/src/gui/rhi/qrhi_p_p.h b/src/gui/rhi/qrhi_p_p.h
@@ -351,7 +351,7 @@ class QRhiBufferData
     QRhiBufferDataPrivate *d = nullptr;
 };
 
-Q_DECLARE_TYPEINFO(QRhiBufferData, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiBufferData, Q_RELOCATABLE_TYPE);
 
 class QRhiResourceUpdateBatchPrivate
 {
@@ -498,8 +498,8 @@ class QRhiResourceUpdateBatchPrivate
     static QRhiResourceUpdateBatchPrivate *get(QRhiResourceUpdateBatch *b) { return b->d; }
 };
 
-Q_DECLARE_TYPEINFO(QRhiResourceUpdateBatchPrivate::BufferOp, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(QRhiResourceUpdateBatchPrivate::TextureOp, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiResourceUpdateBatchPrivate::BufferOp, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiResourceUpdateBatchPrivate::TextureOp, Q_RELOCATABLE_TYPE);
 
 template<typename T>
 struct QRhiBatchedBindings
@@ -652,8 +652,8 @@ class QRhiPassResourceTracker
     QHash<QRhiTexture *, Texture> m_textures;
 };
 
-Q_DECLARE_TYPEINFO(QRhiPassResourceTracker::Buffer, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(QRhiPassResourceTracker::Texture, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiPassResourceTracker::Buffer, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiPassResourceTracker::Texture, Q_RELOCATABLE_TYPE);
 
 template<typename T, int GROW = 1024>
 class QRhiBackendCommandList

diff --git a/src/gui/rhi/qrhid3d11_p_p.h b/src/gui/rhi/qrhid3d11_p_p.h
@@ -277,7 +277,7 @@ struct QD3D11ShaderResourceBindings : public QRhiShaderResourceBindings
     friend class QRhiD3D11;
 };
 
-Q_DECLARE_TYPEINFO(QD3D11ShaderResourceBindings::BoundResourceData, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QD3D11ShaderResourceBindings::BoundResourceData, Q_RELOCATABLE_TYPE);
 
 struct QD3D11GraphicsPipeline : public QRhiGraphicsPipeline
 {
@@ -762,8 +762,8 @@ class QRhiD3D11 : public QRhiImplementation
     } deviceCurse;
 };
 
-Q_DECLARE_TYPEINFO(QRhiD3D11::TextureReadback, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(QRhiD3D11::BufferReadback, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiD3D11::TextureReadback, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiD3D11::BufferReadback, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 

diff --git a/src/gui/rhi/qrhigles2_p_p.h b/src/gui/rhi/qrhigles2_p_p.h
@@ -258,15 +258,15 @@ struct QGles2UniformDescription
     int arrayDim;
 };
 
-Q_DECLARE_TYPEINFO(QGles2UniformDescription, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QGles2UniformDescription, Q_RELOCATABLE_TYPE);
 
 struct QGles2SamplerDescription
 {
     int glslLocation;
     int binding;
 };
 
-Q_DECLARE_TYPEINFO(QGles2SamplerDescription, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QGles2SamplerDescription, Q_RELOCATABLE_TYPE);
 
 using QGles2UniformDescriptionVector = QVarLengthArray<QGles2UniformDescription, 8>;
 using QGles2SamplerDescriptionVector = QVarLengthArray<QGles2SamplerDescription, 4>;
@@ -998,7 +998,7 @@ class QRhiGles2 : public QRhiImplementation
     QHash<QRhiShaderStage, uint> m_shaderCache;
 };
 
-Q_DECLARE_TYPEINFO(QRhiGles2::DeferredReleaseEntry, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiGles2::DeferredReleaseEntry, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 

diff --git a/src/gui/rhi/qrhimetal.mm b/src/gui/rhi/qrhimetal.mm
@@ -216,8 +216,8 @@ void destroy() {
     QHash<QRhiShaderStage, QMetalShader> shaderCache;
 };
 
-Q_DECLARE_TYPEINFO(QRhiMetalData::DeferredReleaseEntry, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(QRhiMetalData::TextureReadback, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiMetalData::DeferredReleaseEntry, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiMetalData::TextureReadback, Q_RELOCATABLE_TYPE);
 
 struct QMetalBufferData
 {

diff --git a/src/gui/rhi/qrhiprofiler_p.h b/src/gui/rhi/qrhiprofiler_p.h
@@ -112,8 +112,8 @@ class Q_GUI_EXPORT QRhiProfiler
     friend class QRhiProfilerPrivate;
 };
 
-Q_DECLARE_TYPEINFO(QRhiProfiler::CpuTime, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(QRhiProfiler::GpuTime, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiProfiler::CpuTime, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiProfiler::GpuTime, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 

diff --git a/src/gui/rhi/qrhiprofiler_p_p.h b/src/gui/rhi/qrhiprofiler_p_p.h
@@ -114,7 +114,7 @@ class QRhiProfilerPrivate
     QHash<QRhiSwapChain *, Sc> swapchains;
 };
 
-Q_DECLARE_TYPEINFO(QRhiProfilerPrivate::Sc, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiProfilerPrivate::Sc, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 

diff --git a/src/gui/rhi/qrhivulkan_p_p.h b/src/gui/rhi/qrhivulkan_p_p.h
@@ -99,7 +99,7 @@ struct QVkBuffer : public QRhiBuffer
     friend class QRhiVulkan;
 };
 
-Q_DECLARE_TYPEINFO(QVkBuffer::DynamicUpdate, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QVkBuffer::DynamicUpdate, Q_RELOCATABLE_TYPE);
 
 struct QVkTexture;
 
@@ -294,7 +294,7 @@ struct QVkShaderResourceBindings : public QRhiShaderResourceBindings
     friend class QRhiVulkan;
 };
 
-Q_DECLARE_TYPEINFO(QVkShaderResourceBindings::BoundResourceData, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QVkShaderResourceBindings::BoundResourceData, Q_RELOCATABLE_TYPE);
 
 struct QVkGraphicsPipeline : public QRhiGraphicsPipeline
 {
@@ -991,10 +991,10 @@ class QRhiVulkan : public QRhiImplementation
     QList<DeferredReleaseEntry> releaseQueue;
 };
 
-Q_DECLARE_TYPEINFO(QRhiVulkan::DescriptorPoolData, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(QRhiVulkan::DeferredReleaseEntry, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(QRhiVulkan::TextureReadback, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(QRhiVulkan::BufferReadback, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiVulkan::DescriptorPoolData, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiVulkan::DeferredReleaseEntry, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiVulkan::TextureReadback, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiVulkan::BufferReadback, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 

diff --git a/src/gui/rhi/qshader_p.h b/src/gui/rhi/qshader_p.h
@@ -79,7 +79,7 @@ class Q_GUI_EXPORT QShaderVersion
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QShaderVersion::Flags)
-Q_DECLARE_TYPEINFO(QShaderVersion, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QShaderVersion, Q_RELOCATABLE_TYPE);
 
 class QShaderCode;
 Q_GUI_EXPORT size_t qHash(const QShaderCode &, size_t = 0) noexcept;
@@ -103,7 +103,7 @@ class Q_GUI_EXPORT QShaderCode
     QByteArray m_entryPoint;
 };
 
-Q_DECLARE_TYPEINFO(QShaderCode, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QShaderCode, Q_RELOCATABLE_TYPE);
 
 class Q_GUI_EXPORT QShader
 {
@@ -192,7 +192,7 @@ class Q_GUI_EXPORT QShaderKey
     QShader::Variant m_sourceVariant = QShader::StandardShader;
 };
 
-Q_DECLARE_TYPEINFO(QShaderKey, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QShaderKey, Q_RELOCATABLE_TYPE);
 
 Q_GUI_EXPORT bool operator==(const QShader &lhs, const QShader &rhs) noexcept;
 Q_GUI_EXPORT size_t qHash(const QShader &s, size_t seed = 0) noexcept;

diff --git a/src/gui/text/freetype/qfontengine_ft_p.h b/src/gui/text/freetype/qfontengine_ft_p.h
@@ -338,7 +338,7 @@ class Q_GUI_EXPORT QFontEngineFT : public QFontEngine
     QFixed scalableBitmapScaleFactor;
 };
 
-Q_DECLARE_TYPEINFO(QFontEngineFT::QGlyphSet, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QFontEngineFT::QGlyphSet, Q_RELOCATABLE_TYPE);
 
 
 inline size_t qHash(const QFontEngineFT::GlyphAndSubPixelPosition &g)

diff --git a/src/gui/text/qcssparser_p.h b/src/gui/text/qcssparser_p.h
@@ -391,7 +391,7 @@ struct Value
 
     Q_GUI_EXPORT QString toString() const;
 };
-QT_CSS_DECLARE_TYPEINFO(Value, Q_MOVABLE_TYPE)
+QT_CSS_DECLARE_TYPEINFO(Value, Q_RELOCATABLE_TYPE)
 
 struct ColorData {
     ColorData() : role(QPalette::NoRole), type(Invalid) {}
@@ -401,7 +401,7 @@ struct ColorData {
     QPalette::ColorRole role;
     enum { Invalid, Color, Role} type;
 };
-QT_CSS_DECLARE_TYPEINFO(ColorData, Q_MOVABLE_TYPE)
+QT_CSS_DECLARE_TYPEINFO(ColorData, Q_RELOCATABLE_TYPE)
 
 struct BrushData {
     BrushData() : role(QPalette::NoRole), type(Invalid) {}
@@ -411,15 +411,15 @@ struct BrushData {
     QPalette::ColorRole role;
     enum { Invalid, Brush, Role, DependsOnThePalette } type;
 };
-QT_CSS_DECLARE_TYPEINFO(BrushData, Q_MOVABLE_TYPE)
+QT_CSS_DECLARE_TYPEINFO(BrushData, Q_RELOCATABLE_TYPE)
 
 struct BackgroundData {
     BrushData brush;
     QString image;
     Repeat repeat;
     Qt::Alignment alignment;
 };
-QT_CSS_DECLARE_TYPEINFO(BackgroundData, Q_MOVABLE_TYPE)
+QT_CSS_DECLARE_TYPEINFO(BackgroundData, Q_RELOCATABLE_TYPE)
 
 struct LengthData {
     qreal number;
@@ -432,7 +432,7 @@ struct BorderData {
     BorderStyle style;
     BrushData color;
 };
-QT_CSS_DECLARE_TYPEINFO(BorderData, Q_MOVABLE_TYPE)
+QT_CSS_DECLARE_TYPEINFO(BorderData, Q_RELOCATABLE_TYPE)
 
 // 1. StyleRule - x:hover, y:clicked > z:checked { prop1: value1; prop2: value2; }
 // 2. QList<Selector> - x:hover, y:clicked z:checked
@@ -483,7 +483,7 @@ struct Q_GUI_EXPORT Declaration
     void borderImageValue(QString *image, int *cuts, TileMode *h, TileMode *v) const;
     bool borderCollapseValue() const;
 };
-QT_CSS_DECLARE_TYPEINFO(Declaration, Q_MOVABLE_TYPE)
+QT_CSS_DECLARE_TYPEINFO(Declaration, Q_RELOCATABLE_TYPE)
 
 const quint64 PseudoClass_Unknown          = Q_UINT64_C(0x0000000000000000);
 const quint64 PseudoClass_Enabled          = Q_UINT64_C(0x0000000000000001);
@@ -543,7 +543,7 @@ struct Pseudo
     QString function;
     bool negated;
 };
-QT_CSS_DECLARE_TYPEINFO(Pseudo, Q_MOVABLE_TYPE)
+QT_CSS_DECLARE_TYPEINFO(Pseudo, Q_RELOCATABLE_TYPE)
 
 struct AttributeSelector
 {
@@ -562,7 +562,7 @@ struct AttributeSelector
     QString value;
     ValueMatchType valueMatchCriterium;
 };
-QT_CSS_DECLARE_TYPEINFO(AttributeSelector, Q_MOVABLE_TYPE)
+QT_CSS_DECLARE_TYPEINFO(AttributeSelector, Q_RELOCATABLE_TYPE)
 
 struct BasicSelector
 {
@@ -584,7 +584,7 @@ struct BasicSelector
 
     Relation relationToNext;
 };
-QT_CSS_DECLARE_TYPEINFO(BasicSelector, Q_MOVABLE_TYPE)
+QT_CSS_DECLARE_TYPEINFO(BasicSelector, Q_RELOCATABLE_TYPE)
 
 struct Q_GUI_EXPORT Selector
 {
@@ -593,7 +593,7 @@ struct Q_GUI_EXPORT Selector
     quint64 pseudoClass(quint64 *negated = nullptr) const;
     QString pseudoElement() const;
 };
-QT_CSS_DECLARE_TYPEINFO(Selector, Q_MOVABLE_TYPE)
+QT_CSS_DECLARE_TYPEINFO(Selector, Q_RELOCATABLE_TYPE)
 
 struct StyleRule
 {
@@ -602,28 +602,28 @@ struct StyleRule
     QList<Declaration> declarations;
     int order;
 };
-QT_CSS_DECLARE_TYPEINFO(StyleRule, Q_MOVABLE_TYPE)
+QT_CSS_DECLARE_TYPEINFO(StyleRule, Q_RELOCATABLE_TYPE)
 
 struct MediaRule
 {
     QStringList media;
     QList<StyleRule> styleRules;
 };
-QT_CSS_DECLARE_TYPEINFO(MediaRule, Q_MOVABLE_TYPE)
+QT_CSS_DECLARE_TYPEINFO(MediaRule, Q_RELOCATABLE_TYPE)
 
 struct PageRule
 {
     QString selector;
     QList<Declaration> declarations;
 };
-QT_CSS_DECLARE_TYPEINFO(PageRule, Q_MOVABLE_TYPE)
+QT_CSS_DECLARE_TYPEINFO(PageRule, Q_RELOCATABLE_TYPE)
 
 struct ImportRule
 {
     QString href;
     QStringList media;
 };
-QT_CSS_DECLARE_TYPEINFO(ImportRule, Q_MOVABLE_TYPE)
+QT_CSS_DECLARE_TYPEINFO(ImportRule, Q_RELOCATABLE_TYPE)
 
 enum StyleSheetOrigin {
     StyleSheetOrigin_Unspecified,
@@ -647,7 +647,7 @@ struct StyleSheet
 
     Q_GUI_EXPORT void buildIndexes(Qt::CaseSensitivity nameCaseSensitivity = Qt::CaseSensitive);
 };
-QT_CSS_DECLARE_TYPEINFO(StyleSheet, Q_MOVABLE_TYPE)
+QT_CSS_DECLARE_TYPEINFO(StyleSheet, Q_RELOCATABLE_TYPE)
 
 
 class Q_GUI_EXPORT StyleSelector
@@ -745,7 +745,7 @@ struct Symbol
     int start, len;
     Q_GUI_EXPORT QString lexem() const;
 };
-QT_CSS_DECLARE_TYPEINFO(Symbol, Q_MOVABLE_TYPE)
+QT_CSS_DECLARE_TYPEINFO(Symbol, Q_RELOCATABLE_TYPE)
 
 class Q_GUI_EXPORT Scanner
 {

diff --git a/src/gui/text/qfontdatabase_p.h b/src/gui/text/qfontdatabase_p.h
@@ -272,7 +272,7 @@ class Q_GUI_EXPORT QFontDatabasePrivate
 
     void invalidate();
 };
-Q_DECLARE_TYPEINFO(QFontDatabasePrivate::ApplicationFont, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QFontDatabasePrivate::ApplicationFont, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 

diff --git a/src/gui/text/qfontsubset.cpp b/src/gui/text/qfontsubset.cpp
@@ -343,7 +343,7 @@ struct QTtfTable {
     Tag tag;
     QByteArray data;
 };
-Q_DECLARE_TYPEINFO(QTtfTable, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QTtfTable, Q_RELOCATABLE_TYPE);
 
 
 struct qttf_head_table {
@@ -391,7 +391,7 @@ struct qttf_name_table {
     QString subfamily;
     QString postscript_name;
 };
-Q_DECLARE_TYPEINFO(qttf_name_table, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(qttf_name_table, Q_RELOCATABLE_TYPE);
 
 
 static QTtfTable generateHead(const qttf_head_table &head);
@@ -419,7 +419,7 @@ struct QTtfGlyph {
     quint16 numPoints;
     QByteArray data;
 };
-Q_DECLARE_TYPEINFO(QTtfGlyph, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QTtfGlyph, Q_RELOCATABLE_TYPE);
 
 static QTtfGlyph generateGlyph(int index, const QPainterPath &path, qreal advance, qreal lsb, qreal ppem);
 // generates glyf, loca and hmtx
@@ -619,7 +619,7 @@ struct QTtfNameRecord {
     quint16 nameId;
     QString value;
 };
-Q_DECLARE_TYPEINFO(QTtfNameRecord, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QTtfNameRecord, Q_RELOCATABLE_TYPE);
 
 static QTtfTable generateName(const QList<QTtfNameRecord> &name);
 

diff --git a/src/gui/text/qstatictext_p.h b/src/gui/text/qstatictext_p.h
@@ -119,7 +119,7 @@ class Q_GUI_EXPORT QStaticTextItem
                                                                   // ================
                                                                   // 43 bytes per item
 };
-Q_DECLARE_TYPEINFO(QStaticTextItem, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QStaticTextItem, Q_RELOCATABLE_TYPE);
 
 class QStaticText;
 class Q_AUTOTEST_EXPORT QStaticTextPrivate

diff --git a/src/gui/text/qtextdocumentfragment_p.h b/src/gui/text/qtextdocumentfragment_p.h
@@ -233,9 +233,9 @@ class QTextHtmlImporter : public QTextHtmlParser
     int currentNodeIdx;
     const QTextHtmlParserNode *currentNode;
 };
-Q_DECLARE_TYPEINFO(QTextHtmlImporter::List, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QTextHtmlImporter::List, Q_RELOCATABLE_TYPE);
 Q_DECLARE_TYPEINFO(QTextHtmlImporter::TableCellIterator, Q_PRIMITIVE_TYPE);
-Q_DECLARE_TYPEINFO(QTextHtmlImporter::Table, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QTextHtmlImporter::Table, Q_RELOCATABLE_TYPE);
 Q_DECLARE_TYPEINFO(QTextHtmlImporter::RowColSpanInfo, Q_PRIMITIVE_TYPE);
 
 QT_END_NAMESPACE

diff --git a/src/gui/text/qtextengine_p.h b/src/gui/text/qtextengine_p.h
@@ -673,7 +673,7 @@ class Q_GUI_EXPORT QStackTextEngine : public QTextEngine {
     LayoutData _layoutData;
     void *_memory[MemSize];
 };
-Q_DECLARE_TYPEINFO(QTextEngine::ItemDecoration, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QTextEngine::ItemDecoration, Q_RELOCATABLE_TYPE);
 
 struct QTextLineItemIterator
 {

diff --git a/src/gui/text/qtextformat.cpp b/src/gui/text/qtextformat.cpp
@@ -177,7 +177,7 @@ struct Property
     { return key == other.key && value == other.value; }
 };
 }
-Q_DECLARE_TYPEINFO(Property, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(Property, Q_RELOCATABLE_TYPE);
 
 class QTextFormatPrivate : public QSharedData
 {

diff --git a/src/gui/text/qtexthtmlparser_p.h b/src/gui/text/qtexthtmlparser_p.h
@@ -269,7 +269,7 @@ struct QTextHtmlParserNode {
 
     friend class QTextHtmlParser;
 };
-Q_DECLARE_TYPEINFO(QTextHtmlParserNode, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QTextHtmlParserNode, Q_RELOCATABLE_TYPE);
 
 
 class QTextHtmlParser
@@ -357,7 +357,7 @@ class QTextHtmlParser
     const QTextDocument *resourceProvider;
 };
 #if QT_CONFIG(cssparser)
-Q_DECLARE_TYPEINFO(QTextHtmlParser::ExternalStyleSheet, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QTextHtmlParser::ExternalStyleSheet, Q_RELOCATABLE_TYPE);
 #endif
 
 QT_END_NAMESPACE

diff --git a/src/gui/text/qtextobject.h b/src/gui/text/qtextobject.h
@@ -179,7 +179,7 @@ class Q_GUI_EXPORT QTextFrame : public QTextObject
     Q_DECLARE_PRIVATE(QTextFrame)
     Q_DISABLE_COPY(QTextFrame)
 };
-Q_DECLARE_TYPEINFO(QTextFrame::iterator, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QTextFrame::iterator, Q_RELOCATABLE_TYPE);
 
 inline void QTextFrame::setFrameFormat(const QTextFrameFormat &aformat)
 { QTextObject::setFormat(aformat); }
@@ -284,8 +284,8 @@ class Q_GUI_EXPORT QTextBlock
     friend class QTextLayout;
 };
 
-Q_DECLARE_TYPEINFO(QTextBlock, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(QTextBlock::iterator, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QTextBlock, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(QTextBlock::iterator, Q_RELOCATABLE_TYPE);
 
 
 class Q_GUI_EXPORT QTextFragment
@@ -320,7 +320,7 @@ class Q_GUI_EXPORT QTextFragment
     int ne;
 };
 
-Q_DECLARE_TYPEINFO(QTextFragment, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QTextFragment, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 

diff --git a/src/gui/text/qzip.cpp b/src/gui/text/qzip.cpp
@@ -414,7 +414,7 @@ struct FileHeader
     QByteArray extra_field;
     QByteArray file_comment;
 };
-Q_DECLARE_TYPEINFO(FileHeader, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(FileHeader, Q_RELOCATABLE_TYPE);
 
 class QZipPrivate
 {

diff --git a/src/gui/text/qzipreader_p.h b/src/gui/text/qzipreader_p.h
@@ -118,7 +118,7 @@ class Q_GUI_EXPORT QZipReader
     QZipReaderPrivate *d;
     Q_DISABLE_COPY_MOVE(QZipReader)
 };
-Q_DECLARE_TYPEINFO(QZipReader::FileInfo, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QZipReader::FileInfo, Q_RELOCATABLE_TYPE);
 Q_DECLARE_TYPEINFO(QZipReader::Status, Q_PRIMITIVE_TYPE);
 
 QT_END_NAMESPACE

diff --git a/src/gui/util/qgridlayoutengine_p.h b/src/gui/util/qgridlayoutengine_p.h
@@ -214,7 +214,7 @@ class Q_GUI_EXPORT QGridLayoutBox
         }
     }
 };
-Q_DECLARE_TYPEINFO(QGridLayoutBox, Q_MOVABLE_TYPE); // cannot be Q_PRIMITIVE_TYPE, as q_maximumSize, say, is != 0
+Q_DECLARE_TYPEINFO(QGridLayoutBox, Q_RELOCATABLE_TYPE); // cannot be Q_PRIMITIVE_TYPE, as q_maximumSize, say, is != 0
 
 bool operator==(const QGridLayoutBox &box1, const QGridLayoutBox &box2);
 inline bool operator!=(const QGridLayoutBox &box1, const QGridLayoutBox &box2)

diff --git a/src/gui/util/qshaderformat_p.h b/src/gui/util/qshaderformat_p.h
@@ -114,7 +114,7 @@ inline bool operator!=(const QShaderFormat &lhs, const QShaderFormat &rhs) noexc
     return !(lhs == rhs);
 }
 
-Q_DECLARE_TYPEINFO(QShaderFormat, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QShaderFormat, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 

diff --git a/src/gui/util/qshadergenerator_p.h b/src/gui/util/qshadergenerator_p.h
@@ -70,7 +70,7 @@ class QShaderGenerator
     QShaderFormat format;
 };
 
-Q_DECLARE_TYPEINFO(QShaderGenerator, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QShaderGenerator, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 

diff --git a/src/gui/util/qshadergraph_p.h b/src/gui/util/qshadergraph_p.h
@@ -111,9 +111,9 @@ inline bool operator!=(const QShaderGraph::Statement &lhs, const QShaderGraph::S
     return !(lhs == rhs);
 }
 
-Q_DECLARE_TYPEINFO(QShaderGraph, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(QShaderGraph::Edge, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(QShaderGraph::Statement, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QShaderGraph, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(QShaderGraph::Edge, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(QShaderGraph::Statement, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 

diff --git a/src/gui/util/qshadergraphloader_p.h b/src/gui/util/qshadergraphloader_p.h
@@ -89,7 +89,7 @@ class QShaderGraphLoader
     QShaderGraph m_graph;
 };
 
-Q_DECLARE_TYPEINFO(QShaderGraphLoader, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QShaderGraphLoader, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 

diff --git a/src/gui/util/qshadernode_p.h b/src/gui/util/qshadernode_p.h
@@ -117,8 +117,8 @@ inline bool operator!=(const QShaderNode::Rule &lhs, const QShaderNode::Rule &rh
     return !(lhs == rhs);
 }
 
-Q_DECLARE_TYPEINFO(QShaderNode, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(QShaderNode::Rule, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QShaderNode, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(QShaderNode::Rule, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 

diff --git a/src/gui/util/qshadernodeport_p.h b/src/gui/util/qshadernodeport_p.h
@@ -79,7 +79,7 @@ inline bool operator!=(const QShaderNodePort &lhs, const QShaderNodePort &rhs) n
     return !(lhs == rhs);
 }
 
-Q_DECLARE_TYPEINFO(QShaderNodePort, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QShaderNodePort, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 

diff --git a/src/gui/util/qshadernodesloader_p.h b/src/gui/util/qshadernodesloader_p.h
@@ -86,7 +86,7 @@ class QShaderNodesLoader
     QHash<QString, QShaderNode> m_nodes;
 };
 
-Q_DECLARE_TYPEINFO(QShaderNodesLoader, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QShaderNodesLoader, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 

diff --git a/src/gui/util/qtexturefiledata_p.h b/src/gui/util/qtexturefiledata_p.h
@@ -106,7 +106,7 @@ class Q_GUI_EXPORT QTextureFileData
     QSharedDataPointer<QTextureFileDataPrivate> d;
 };
 
-Q_DECLARE_TYPEINFO(QTextureFileData, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QTextureFileData, Q_RELOCATABLE_TYPE);
 
 Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QTextureFileData &d);
 

diff --git a/src/gui/vulkan/qvulkaninstance.h b/src/gui/vulkan/qvulkaninstance.h
@@ -104,7 +104,7 @@ struct QVulkanLayer
     QVersionNumber specVersion;
     QByteArray description;
 };
-Q_DECLARE_TYPEINFO(QVulkanLayer, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QVulkanLayer, Q_RELOCATABLE_TYPE);
 
 inline bool operator==(const QVulkanLayer &lhs, const QVulkanLayer &rhs) noexcept
 {
@@ -127,7 +127,7 @@ struct QVulkanExtension
     QByteArray name;
     uint32_t version;
 };
-Q_DECLARE_TYPEINFO(QVulkanExtension, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QVulkanExtension, Q_RELOCATABLE_TYPE);
 
 inline bool operator==(const QVulkanExtension &lhs, const QVulkanExtension &rhs) noexcept
 {

diff --git a/src/network/access/qnetworkaccessauthenticationmanager_p.h b/src/network/access/qnetworkaccessauthenticationmanager_p.h
@@ -74,7 +74,7 @@ class QNetworkAuthenticationCredential
         return domain.isNull() && user.isNull() && password.isNull();
     }
 };
-Q_DECLARE_TYPEINFO(QNetworkAuthenticationCredential, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QNetworkAuthenticationCredential, Q_RELOCATABLE_TYPE);
 inline bool operator<(const QNetworkAuthenticationCredential &t1, const QString &t2)
 { return t1.domain < t2; }
 inline bool operator<(const QString &t1, const QNetworkAuthenticationCredential &t2)

diff --git a/src/network/access/qnetworkrequest_p.h b/src/network/access/qnetworkrequest_p.h
@@ -91,7 +91,7 @@ class QNetworkHeadersPrivate
     void parseAndSetHeader(const QByteArray &key, const QByteArray &value);
 };
 
-Q_DECLARE_TYPEINFO(QNetworkHeadersPrivate::RawHeaderPair, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QNetworkHeadersPrivate::RawHeaderPair, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 

diff --git a/src/network/ssl/qasn1element_p.h b/src/network/ssl/qasn1element_p.h
@@ -175,7 +175,7 @@ class Q_AUTOTEST_EXPORT QAsn1Element
     quint8 mType;
     QByteArray mValue;
 };
-Q_DECLARE_TYPEINFO(QAsn1Element, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QAsn1Element, Q_RELOCATABLE_TYPE);
 
 inline bool operator==(const QAsn1Element &e1, const QAsn1Element &e2)
 { return e1.mType == e2.mType && e1.mValue == e2.mValue; }

diff --git a/src/plugins/generic/tuiotouch/qoscbundle_p.h b/src/plugins/generic/tuiotouch/qoscbundle_p.h
@@ -68,7 +68,7 @@ class QOscBundle
     QList<QOscBundle> m_bundles;
     QList<QOscMessage> m_messages;
 };
-Q_DECLARE_TYPEINFO(QOscBundle, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QOscBundle, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 

diff --git a/src/plugins/generic/tuiotouch/qoscmessage_p.h b/src/plugins/generic/tuiotouch/qoscmessage_p.h
@@ -65,7 +65,7 @@ class QOscMessage
     QByteArray m_addressPattern;
     QVariantList m_arguments;
 };
-Q_DECLARE_TYPEINFO(QOscMessage, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QOscMessage, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 

diff --git a/src/plugins/generic/tuiotouch/qtuiocursor_p.h b/src/plugins/generic/tuiotouch/qtuiocursor_p.h
@@ -102,7 +102,7 @@ class QTuioCursor
     float m_acceleration;
     QEventPoint::State m_state;
 };
-Q_DECLARE_TYPEINFO(QTuioCursor, Q_MOVABLE_TYPE); // Q_PRIMITIVE_TYPE: not possible, m_state is = 1, not 0.
+Q_DECLARE_TYPEINFO(QTuioCursor, Q_RELOCATABLE_TYPE); // Q_PRIMITIVE_TYPE: not possible, m_state is = 1, not 0.
 
 QT_END_NAMESPACE
 

diff --git a/src/plugins/generic/tuiotouch/qtuiotoken_p.h b/src/plugins/generic/tuiotouch/qtuiotoken_p.h
@@ -138,7 +138,7 @@ class QTuioToken
     float m_angularAcceleration;
     QEventPoint::State m_state;
 };
-Q_DECLARE_TYPEINFO(QTuioToken, Q_MOVABLE_TYPE); // Q_PRIMITIVE_TYPE: not possible: m_id, m_classId == -1
+Q_DECLARE_TYPEINFO(QTuioToken, Q_RELOCATABLE_TYPE); // Q_PRIMITIVE_TYPE: not possible: m_id, m_classId == -1
 
 QT_END_NAMESPACE
 

diff --git a/src/plugins/platforminputcontexts/ibus/qibustypes.h b/src/plugins/platforminputcontexts/ibus/qibustypes.h
@@ -92,7 +92,7 @@ class QIBusAttribute : private QIBusSerializable
     quint32 start;
     quint32 end;
 };
-Q_DECLARE_TYPEINFO(QIBusAttribute, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QIBusAttribute, Q_RELOCATABLE_TYPE);
 
 class QIBusAttributeList : private QIBusSerializable
 {
@@ -106,7 +106,7 @@ class QIBusAttributeList : private QIBusSerializable
 
     QList<QIBusAttribute> attributes;
 };
-Q_DECLARE_TYPEINFO(QIBusAttributeList, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QIBusAttributeList, Q_RELOCATABLE_TYPE);
 
 class QIBusText : private QIBusSerializable
 {
@@ -119,7 +119,7 @@ class QIBusText : private QIBusSerializable
     QString text;
     QIBusAttributeList attributes;
 };
-Q_DECLARE_TYPEINFO(QIBusText, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QIBusText, Q_RELOCATABLE_TYPE);
 
 class QIBusEngineDesc : private QIBusSerializable
 {
@@ -147,7 +147,7 @@ class QIBusEngineDesc : private QIBusSerializable
     QString textdomain;
     QString iconpropkey;
 };
-Q_DECLARE_TYPEINFO(QIBusEngineDesc, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QIBusEngineDesc, Q_RELOCATABLE_TYPE);
 
 inline QDBusArgument &operator<<(QDBusArgument &argument, const QIBusAttribute &attribute)
 { attribute.serializeTo(argument); return argument; }

diff --git a/src/plugins/platforms/xcb/qxcbconnection.h b/src/plugins/platforms/xcb/qxcbconnection.h
@@ -388,7 +388,7 @@ class Q_XCB_EXPORT QXcbConnection : public QXcbBasicConnection
 };
 #if QT_CONFIG(tabletevent)
 Q_DECLARE_TYPEINFO(QXcbConnection::TabletData::ValuatorClassInfo, Q_PRIMITIVE_TYPE);
-Q_DECLARE_TYPEINFO(QXcbConnection::TabletData, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QXcbConnection::TabletData, Q_RELOCATABLE_TYPE);
 #endif
 
 class QXcbConnectionGrabber

diff --git a/src/plugins/platforms/xcb/qxcbdrag.h b/src/plugins/platforms/xcb/qxcbdrag.h
@@ -191,7 +191,7 @@ class QXcbDrag : public QXcbObject, public QBasicDrag, public QXcbWindowEventLis
     int findTransactionByTime(xcb_timestamp_t timestamp);
     xcb_window_t findRealWindow(const QPoint & pos, xcb_window_t w, int md, bool ignoreNonXdndAwareWindows);
 };
-Q_DECLARE_TYPEINFO(QXcbDrag::Transaction, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QXcbDrag::Transaction, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 

diff --git a/src/testlib/qbenchmark_p.h b/src/testlib/qbenchmark_p.h
@@ -91,7 +91,7 @@ struct QBenchmarkContext
 
     QBenchmarkContext()  = default;
 };
-Q_DECLARE_TYPEINFO(QBenchmarkContext, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QBenchmarkContext, Q_RELOCATABLE_TYPE);
 
 class QBenchmarkResult
 {
@@ -121,7 +121,7 @@ class QBenchmarkResult
         return (value / iterations) < (other.value / other.iterations);
     }
 };
-Q_DECLARE_TYPEINFO(QBenchmarkResult, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QBenchmarkResult, Q_RELOCATABLE_TYPE);
 
 /*
     The QBenchmarkGlobalData class stores global benchmark-related data.

diff --git a/src/tools/moc/moc.h b/src/tools/moc/moc.h
@@ -60,7 +60,7 @@ struct Type
     Token firstToken;
     ReferenceType referenceType;
 };
-Q_DECLARE_TYPEINFO(Type, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(Type, Q_RELOCATABLE_TYPE);
 
 struct ClassDef;
 struct EnumDef
@@ -72,7 +72,7 @@ struct EnumDef
     EnumDef() : isEnumClass(false) {}
     QJsonObject toJson(const ClassDef &cdef) const;
 };
-Q_DECLARE_TYPEINFO(EnumDef, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(EnumDef, Q_RELOCATABLE_TYPE);
 
 struct ArgumentDef
 {
@@ -84,7 +84,7 @@ struct ArgumentDef
 
     QJsonObject toJson() const;
 };
-Q_DECLARE_TYPEINFO(ArgumentDef, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(ArgumentDef, Q_RELOCATABLE_TYPE);
 
 struct FunctionDef
 {
@@ -121,7 +121,7 @@ struct FunctionDef
     QJsonObject toJson() const;
     static void accessToJson(QJsonObject *obj, Access acs);
 };
-Q_DECLARE_TYPEINFO(FunctionDef, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(FunctionDef, Q_RELOCATABLE_TYPE);
 
 struct PropertyDef
 {
@@ -145,7 +145,7 @@ struct PropertyDef
 
     QJsonObject toJson() const;
 };
-Q_DECLARE_TYPEINFO(PropertyDef, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(PropertyDef, Q_RELOCATABLE_TYPE);
 
 struct PrivateQPropertyDef
 {
@@ -155,14 +155,14 @@ struct PrivateQPropertyDef
     QByteArray accessor;
     QByteArray storage;
 };
-Q_DECLARE_TYPEINFO(PrivateQPropertyDef, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(PrivateQPropertyDef, Q_RELOCATABLE_TYPE);
 
 struct ClassInfoDef
 {
     QByteArray name;
     QByteArray value;
 };
-Q_DECLARE_TYPEINFO(ClassInfoDef, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(ClassInfoDef, Q_RELOCATABLE_TYPE);
 
 struct BaseDef {
     QByteArray classname;
@@ -208,14 +208,14 @@ struct ClassDef : BaseDef {
 
     QJsonObject toJson() const;
 };
-Q_DECLARE_TYPEINFO(ClassDef, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(ClassDef::Interface, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(ClassDef, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(ClassDef::Interface, Q_RELOCATABLE_TYPE);
 
 struct NamespaceDef : BaseDef {
     bool hasQNamespace = false;
     bool doGenerate = false;
 };
-Q_DECLARE_TYPEINFO(NamespaceDef, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(NamespaceDef, Q_RELOCATABLE_TYPE);
 
 class Moc : public Parser
 {

diff --git a/src/tools/moc/symbols.h b/src/tools/moc/symbols.h
@@ -118,7 +118,7 @@ struct Symbol
 
 #endif
 };
-Q_DECLARE_TYPEINFO(Symbol, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(Symbol, Q_RELOCATABLE_TYPE);
 
 typedef QList<Symbol> Symbols;
 
@@ -128,7 +128,7 @@ struct SafeSymbols {
     QSet<QByteArray> excludedSymbols;
     int index;
 };
-Q_DECLARE_TYPEINFO(SafeSymbols, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(SafeSymbols, Q_RELOCATABLE_TYPE);
 
 class SymbolStack : public QStack<SafeSymbols>
 {

diff --git a/src/tools/tracegen/provider.h b/src/tools/tracegen/provider.h
@@ -92,8 +92,8 @@ struct Provider
 
 Provider parseProvider(const QString &filename);
 
-Q_DECLARE_TYPEINFO(Tracepoint::Argument, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(Tracepoint::Field, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(Tracepoint, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(Tracepoint::Argument, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(Tracepoint::Field, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(Tracepoint, Q_RELOCATABLE_TYPE);
 
 #endif // PROVIDER_H
diff --git a/src/tools/uic/cpp/cppwriteinitialization.h b/src/tools/uic/cpp/cppwriteinitialization.h
@@ -325,7 +325,7 @@ struct WriteInitialization : public TreeWalker
 
 } // namespace CPP
 
-Q_DECLARE_TYPEINFO(CPP::WriteInitialization::Buddy, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(CPP::WriteInitialization::Buddy, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 

diff --git a/src/widgets/dialogs/qsidebar_p.h b/src/widgets/dialogs/qsidebar_p.h
@@ -117,7 +117,7 @@ private Q_SLOTS:
     QList<WatchItem> watching;
     QList<QUrl> invalidUrls;
 };
-Q_DECLARE_TYPEINFO(QUrlModel::WatchItem, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QUrlModel::WatchItem, Q_RELOCATABLE_TYPE);
 
 class Q_AUTOTEST_EXPORT QSidebar : public QListView
 {

diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp
@@ -179,7 +179,7 @@ class QWizardDefaultProperty
                                    const char *changedSignal)
         : className(className), property(property), changedSignal(changedSignal) {}
 };
-Q_DECLARE_TYPEINFO(QWizardDefaultProperty, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QWizardDefaultProperty, Q_RELOCATABLE_TYPE);
 
 class QWizardField
 {
@@ -199,7 +199,7 @@ class QWizardField
     QByteArray changedSignal;
     QVariant initialValue;
 };
-Q_DECLARE_TYPEINFO(QWizardField, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QWizardField, Q_RELOCATABLE_TYPE);
 
 QWizardField::QWizardField(QWizardPage *page, const QString &spec, QObject *object,
                            const char *property, const char *changedSignal)

diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout_p.h b/src/widgets/graphicsview/qgraphicsanchorlayout_p.h
@@ -335,7 +335,7 @@ class GraphPath
 } // namespace QtGraphicsAnchorLayout
 using namespace QtGraphicsAnchorLayout;
 
-Q_DECLARE_TYPEINFO(GraphPath, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(GraphPath, Q_RELOCATABLE_TYPE);
 
 class QGraphicsAnchorLayoutPrivate;
 /*!

diff --git a/src/widgets/graphicsview/qgraphicsitem_p.h b/src/widgets/graphicsview/qgraphicsitem_p.h
@@ -523,7 +523,7 @@ class Q_WIDGETS_EXPORT QGraphicsItemPrivate
     int globalStackingOrder;
     QGraphicsItem *q_ptr;
 };
-Q_DECLARE_TYPEINFO(QGraphicsItemPrivate::ExtraStruct, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QGraphicsItemPrivate::ExtraStruct, Q_RELOCATABLE_TYPE);
 
 struct QGraphicsItemPrivate::TransformData
 {

diff --git a/src/widgets/itemviews/qdatawidgetmapper.cpp b/src/widgets/itemviews/qdatawidgetmapper.cpp
@@ -124,7 +124,7 @@ class QDataWidgetMapperPrivate: public QObjectPrivate
 
     std::vector<WidgetMapper> widgetMap;
 };
-Q_DECLARE_TYPEINFO(QDataWidgetMapperPrivate::WidgetMapper, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QDataWidgetMapperPrivate::WidgetMapper, Q_RELOCATABLE_TYPE);
 
 int QDataWidgetMapperPrivate::findWidget(QWidget *w) const
 {

diff --git a/src/widgets/itemviews/qheaderview_p.h b/src/widgets/itemviews/qheaderview_p.h
@@ -388,7 +388,7 @@ class QHeaderViewPrivate: public QAbstractItemViewPrivate
 
 };
 Q_DECLARE_TYPEINFO(QHeaderViewPrivate::SectionItem, Q_PRIMITIVE_TYPE);
-Q_DECLARE_TYPEINFO(QHeaderViewPrivate::LayoutChangeItem, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QHeaderViewPrivate::LayoutChangeItem, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 

diff --git a/src/widgets/itemviews/qtableview_p.h b/src/widgets/itemviews/qtableview_p.h
@@ -127,7 +127,7 @@ class Q_AUTOTEST_EXPORT QSpanCollection
     bool cleanSpanSubIndex(SubIndex &subindex, int end, bool update = false);
 };
 
-Q_DECLARE_TYPEINFO ( QSpanCollection::Span, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO ( QSpanCollection::Span, Q_RELOCATABLE_TYPE);
 
 
 class QTableViewPrivate : public QAbstractItemViewPrivate

diff --git a/src/widgets/itemviews/qtreeview_p.h b/src/widgets/itemviews/qtreeview_p.h
@@ -78,7 +78,7 @@ struct QTreeViewItem
     int height : 16; // row height
 };
 
-Q_DECLARE_TYPEINFO(QTreeViewItem, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QTreeViewItem, Q_RELOCATABLE_TYPE);
 
 class Q_WIDGETS_EXPORT QTreeViewPrivate : public QAbstractItemViewPrivate
 {

diff --git a/src/widgets/itemviews/qwidgetitemdata_p.h b/src/widgets/itemviews/qwidgetitemdata_p.h
@@ -65,7 +65,7 @@ class QWidgetItemData
     QVariant value;
     inline bool operator==(const QWidgetItemData &other) const { return role == other.role && value == other.value; }
 };
-Q_DECLARE_TYPEINFO(QWidgetItemData, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QWidgetItemData, Q_RELOCATABLE_TYPE);
 
 #ifndef QT_NO_DATASTREAM
 

diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp
@@ -640,7 +640,7 @@ class QRenderRule
     int clipset;
     QPainterPath clipPath;
 };
-Q_DECLARE_TYPEINFO(QRenderRule, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRenderRule, Q_RELOCATABLE_TYPE);
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 static const char knownStyleHints[][45] = {

diff --git a/src/widgets/widgets/qtextbrowser.cpp b/src/widgets/widgets/qtextbrowser.cpp
@@ -154,7 +154,7 @@ class QTextBrowserPrivate : public QTextEditPrivate
         emit q->highlighted(url);
     }
 };
-Q_DECLARE_TYPEINFO(QTextBrowserPrivate::HistoryEntry, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QTextBrowserPrivate::HistoryEntry, Q_RELOCATABLE_TYPE);
 
 QString QTextBrowserPrivate::findFile(const QUrl &name) const
 {

diff --git a/src/widgets/widgets/qtoolbararealayout_p.h b/src/widgets/widgets/qtoolbararealayout_p.h
@@ -126,7 +126,7 @@ class QToolBarAreaLayoutLine
 
     QList<QToolBarAreaLayoutItem> toolBarItems;
 };
-Q_DECLARE_TYPEINFO(QToolBarAreaLayoutLine, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QToolBarAreaLayoutLine, Q_RELOCATABLE_TYPE);
 
 class QToolBarAreaLayoutInfo
 {
@@ -157,7 +157,7 @@ class QToolBarAreaLayoutInfo
     QInternal::DockPosition dockPos;
     bool dirty;
 };
-Q_DECLARE_TYPEINFO(QToolBarAreaLayoutInfo, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QToolBarAreaLayoutInfo, Q_RELOCATABLE_TYPE);
 
 class QToolBarAreaLayout
 {

diff --git a/tests/auto/corelib/animation/qparallelanimationgroup/tst_qparallelanimationgroup.cpp b/tests/auto/corelib/animation/qparallelanimationgroup/tst_qparallelanimationgroup.cpp
@@ -787,7 +787,7 @@ struct AnimState {
     int state;
 };
 QT_BEGIN_NAMESPACE
-Q_DECLARE_TYPEINFO(AnimState, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(AnimState, Q_RELOCATABLE_TYPE);
 QT_END_NAMESPACE
 
 #define Running QAbstractAnimation::Running

diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
@@ -655,7 +655,7 @@ Q_DECLARE_METATYPE(Whity<double>)
 
 #if !defined(Q_CC_CLANG) && defined(Q_CC_GNU) && Q_CC_GNU < 501
 QT_BEGIN_NAMESPACE
-Q_DECLARE_TYPEINFO(Whity<double>, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(Whity<double>, Q_RELOCATABLE_TYPE);
 QT_END_NAMESPACE
 #endif
 
@@ -1019,7 +1019,7 @@ qsizetype qHash(const CustomMovable &, qsizetype seed = 0) { return seed; }
 
 #if !defined(Q_CC_CLANG) && defined(Q_CC_GNU) && Q_CC_GNU < 501
 QT_BEGIN_NAMESPACE
-Q_DECLARE_TYPEINFO(CustomMovable, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(CustomMovable, Q_RELOCATABLE_TYPE);
 QT_END_NAMESPACE
 #endif
 
@@ -1057,7 +1057,7 @@ class P { Q_DECL_UNUSED_MEMBER char _[4]; };
 
 QT_BEGIN_NAMESPACE
 #if defined(Q_CC_GNU) && Q_CC_GNU < 501
-Q_DECLARE_TYPEINFO(M, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(M, Q_RELOCATABLE_TYPE);
 Q_DECLARE_TYPEINFO(P, Q_PRIMITIVE_TYPE);
 #endif
 QT_END_NAMESPACE

diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
@@ -3382,7 +3382,7 @@ struct MyShared : QSharedData {
 };
 
 QT_BEGIN_NAMESPACE
-Q_DECLARE_TYPEINFO(MyMovable, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(MyMovable, Q_RELOCATABLE_TYPE);
 QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(MyPrimitive)

diff --git a/tests/auto/corelib/text/qlatin1string/tst_qlatin1string.cpp b/tests/auto/corelib/text/qlatin1string/tst_qlatin1string.cpp
@@ -35,7 +35,7 @@ struct QLatin1StringContainer {
     QLatin1String l1;
 };
 QT_BEGIN_NAMESPACE
-Q_DECLARE_TYPEINFO(QLatin1StringContainer, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QLatin1StringContainer, Q_RELOCATABLE_TYPE);
 QT_END_NAMESPACE
 Q_DECLARE_METATYPE(QLatin1StringContainer)
 

diff --git a/tests/auto/corelib/text/qregularexpression/tst_qregularexpression.cpp b/tests/auto/corelib/text/qregularexpression/tst_qregularexpression.cpp
@@ -112,7 +112,7 @@ struct Match
     QHash<QString, QString> namedCaptured;
 };
 QT_BEGIN_NAMESPACE
-Q_DECLARE_TYPEINFO(Match, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(Match, Q_RELOCATABLE_TYPE);
 QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(Match)

diff --git a/tests/auto/corelib/tools/collections/tst_collections.cpp b/tests/auto/corelib/tools/collections/tst_collections.cpp
@@ -151,7 +151,7 @@ struct Movable {
 
 int Movable::count = 0;
 QT_BEGIN_NAMESPACE
-Q_DECLARE_TYPEINFO(Movable, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(Movable, Q_RELOCATABLE_TYPE);
 QT_END_NAMESPACE
 
 

diff --git a/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp b/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp
@@ -81,7 +81,7 @@ QDebug &operator<<(QDebug &d, Movable m)
 }
 
 QT_BEGIN_NAMESPACE
-Q_DECLARE_TYPEINFO(Movable, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(Movable, Q_RELOCATABLE_TYPE);
 QT_END_NAMESPACE
 
 struct Complex

diff --git a/tests/auto/corelib/tools/qlist/tst_qlist.cpp b/tests/auto/corelib/tools/qlist/tst_qlist.cpp
@@ -112,7 +112,7 @@ inline size_t qHash(const Movable &key, size_t seed = 0) { return qHash(key.i, s
 
 QAtomicInt Movable::counter = 0;
 QT_BEGIN_NAMESPACE
-Q_DECLARE_TYPEINFO(Movable, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(Movable, Q_RELOCATABLE_TYPE);
 QT_END_NAMESPACE
 Q_DECLARE_METATYPE(Movable);
 

diff --git a/tests/auto/corelib/tools/qpair/tst_qpair.cpp b/tests/auto/corelib/tools/qpair/tst_qpair.cpp
@@ -48,7 +48,7 @@ class M { M() {} Q_DECL_UNUSED_MEMBER char _[4]; };
 class P { Q_DECL_UNUSED_MEMBER char _[4]; };
 
 QT_BEGIN_NAMESPACE
-Q_DECLARE_TYPEINFO(M, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(M, Q_RELOCATABLE_TYPE);
 Q_DECLARE_TYPEINFO(P, Q_PRIMITIVE_TYPE);
 QT_END_NAMESPACE
 

diff --git a/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp b/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp
@@ -503,7 +503,7 @@ struct MyComplex
 QT_BEGIN_NAMESPACE
 
 Q_DECLARE_TYPEINFO(MyPrimitive, Q_PRIMITIVE_TYPE);
-Q_DECLARE_TYPEINFO(MyMovable, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(MyMovable, Q_RELOCATABLE_TYPE);
 Q_DECLARE_TYPEINFO(MyComplex, Q_COMPLEX_TYPE);
 
 QT_END_NAMESPACE

diff --git a/tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp
@@ -93,7 +93,7 @@ struct BigClass
 };
 static_assert(sizeof(BigClass) > sizeof(QVariant::Private::MaxInternalSize));
 QT_BEGIN_NAMESPACE
-Q_DECLARE_TYPEINFO(BigClass, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(BigClass, Q_RELOCATABLE_TYPE);
 QT_END_NAMESPACE
 Q_DECLARE_METATYPE(BigClass);
 
@@ -103,7 +103,7 @@ struct SmallClass
 };
 static_assert(sizeof(SmallClass) <= sizeof(QVariant::Private::MaxInternalSize));
 QT_BEGIN_NAMESPACE
-Q_DECLARE_TYPEINFO(SmallClass, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(SmallClass, Q_RELOCATABLE_TYPE);
 QT_END_NAMESPACE
 Q_DECLARE_METATYPE(SmallClass);
 

diff --git a/tests/benchmarks/corelib/tools/qlist/main.cpp b/tests/benchmarks/corelib/tools/qlist/main.cpp
@@ -120,7 +120,7 @@ struct MyComplex : public MyBase
 QT_BEGIN_NAMESPACE
 
 Q_DECLARE_TYPEINFO(MyPrimitive, Q_PRIMITIVE_TYPE);
-Q_DECLARE_TYPEINFO(MyMovable, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(MyMovable, Q_RELOCATABLE_TYPE);
 Q_DECLARE_TYPEINFO(MyComplex, Q_COMPLEX_TYPE);
 
 QT_END_NAMESPACE

diff --git a/tests/manual/rhi/qrhiprof/qrhiprof.cpp b/tests/manual/rhi/qrhiprof/qrhiprof.cpp
@@ -274,10 +274,10 @@ public slots:
     }
 };
 
-Q_DECLARE_TYPEINFO(Tracker::Buffer, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(Tracker::Texture, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(Tracker::FrameTime, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(Tracker::GpuFrameTime, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(Tracker::Buffer, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(Tracker::Texture, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(Tracker::FrameTime, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(Tracker::GpuFrameTime, Q_RELOCATABLE_TYPE);
 
 void Tracker::handleEvent(const Parser::Event &e)
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -140,7 +140,7 @@ class QPainterClipInfo @@
     };
-    Q_DECLARE_TYPEINFO(QPainterClipInfo, Q_MOVABLE_TYPE);
+    Q_DECLARE_TYPEINFO(QPainterClipInfo, Q_RELOCATABLE_TYPE);
     class Q_GUI_EXPORT QPainterState : public QPaintEngineState
     {
@@ Expand Down @@