From 0440614af0bb08e373d8e3e40f90b6412c043d14 Mon Sep 17 00:00:00 2001
From: Andreas Buhr <andreas.buhr@qt.io>
Date: Fri, 27 Nov 2020 11:18:00 +0100
Subject: Replace discouraged Q_MOVABLE_TYPE by Q_RELOCATABLE_TYPE

Q_MOVABLE_TYPE was conceived before C++ had move semantics. Now, with
move semantics, its name is misleading. Q_RELOCATABLE_TYPE was
introduced as a synonym to Q_MOVABLE_TYPE. Usage of Q_MOVABLE_TYPE
is discouraged now. This patch replaces all usages of Q_MOVABLE_TYPE
by Q_RELOCATABLE_TYPE in QtBase. As the two are synonymous, this
patch should have no impact on users.

Pick-to: 6.0
Change-Id: Ie653984363198c1aeb1f70f8e0fa189aae38eb5c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
---
 src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp | 2 +-
 src/corelib/global/qlogging.cpp                              | 2 +-
 src/corelib/global/qnamespace.h                              | 2 +-
 src/corelib/global/qtypeinfo.h                               | 6 +++---
 src/corelib/io/qfilesystemwatcher_win_p.h                    | 2 +-
 src/corelib/io/qloggingregistry_p.h                          | 2 +-
 src/corelib/io/qprocess_p.h                                  | 4 ++--
 src/corelib/io/qresource.cpp                                 | 2 +-
 src/corelib/io/qsettings.cpp                                 | 6 +++---
 src/corelib/io/qsettings_p.h                                 | 4 ++--
 src/corelib/itemmodels/qabstractitemmodel.h                  | 6 +++---
 src/corelib/itemmodels/qabstractitemmodel_p.h                | 2 +-
 src/corelib/itemmodels/qitemselectionmodel.h                 | 2 +-
 src/corelib/kernel/qassociativeiterable.h                    | 6 +++---
 src/corelib/kernel/qbasictimer.h                             | 2 +-
 src/corelib/kernel/qmetaobject.h                             | 6 +++---
 src/corelib/kernel/qmetaobject_p.h                           | 2 +-
 src/corelib/kernel/qmetaobjectbuilder.cpp                    | 6 +++---
 src/corelib/kernel/qmetatype.h                               | 2 +-
 src/corelib/kernel/qmimedata.cpp                             | 2 +-
 src/corelib/kernel/qobject_p.h                               | 6 +++---
 src/corelib/kernel/qpointer.h                                | 2 +-
 src/corelib/kernel/qsequentialiterable.h                     | 6 +++---
 src/corelib/serialization/qxmlstream.h                       | 8 ++++----
 src/corelib/text/qchar.h                                     | 2 +-
 src/corelib/text/qlocale_p.h                                 | 2 +-
 src/corelib/text/qstring.cpp                                 | 2 +-
 src/corelib/text/qstring.h                                   | 2 +-
 src/corelib/thread/qthread_p.h                               | 2 +-
 src/corelib/time/qdatetime.h                                 | 4 ++--
 src/corelib/time/qtimezone.h                                 | 2 +-
 src/corelib/time/qtimezoneprivate_p.h                        | 2 +-
 src/corelib/tools/qcommandlineparser.cpp                     | 2 +-
 src/corelib/tools/qline.h                                    | 4 ++--
 src/corelib/tools/qmargins.h                                 | 4 ++--
 src/corelib/tools/qpoint.h                                   | 4 ++--
 src/corelib/tools/qrect.h                                    | 4 ++--
 src/corelib/tools/qringbuffer_p.h                            | 2 +-
 src/corelib/tools/qshareddata.h                              | 4 ++--
 src/corelib/tools/qsharedpointer_impl.h                      | 4 ++--
 src/corelib/tools/qsize.h                                    | 4 ++--
 src/corelib/tools/qversionnumber.h                           | 4 ++--
 42 files changed, 72 insertions(+), 72 deletions(-)

(limited to 'src/corelib')

diff --git a/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp b/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp
index a540b88247..2d060fbb47 100644
--- a/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp
@@ -553,7 +553,7 @@ private:
     int *data;
 };
 
-Q_DECLARE_TYPEINFO(Point2D, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(Point2D, Q_RELOCATABLE_TYPE);
 //! [39]
 
 
diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp
index 52a565aa45..04468d7aac 100644
--- a/src/corelib/global/qlogging.cpp
+++ b/src/corelib/global/qlogging.cpp
@@ -1096,7 +1096,7 @@ struct QMessagePattern
     static QBasicMutex mutex;
 };
 #ifdef QLOGGING_HAVE_BACKTRACE
-Q_DECLARE_TYPEINFO(QMessagePattern::BacktraceParams, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QMessagePattern::BacktraceParams, Q_RELOCATABLE_TYPE);
 #endif
 
 QBasicMutex QMessagePattern::mutex;
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index a42dc726bc..4bc0186210 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -1919,7 +1919,7 @@ public:
     }
 };
 
-Q_DECLARE_TYPEINFO(QKeyCombination, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QKeyCombination, Q_RELOCATABLE_TYPE);
 
 constexpr QKeyCombination operator|(Qt::Modifier modifier, Qt::Key key) noexcept
 {
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
 {
diff --git a/src/corelib/io/qfilesystemwatcher_win_p.h b/src/corelib/io/qfilesystemwatcher_win_p.h
index 7808aff2ac..778ed8ce23 100644
--- a/src/corelib/io/qfilesystemwatcher_win_p.h
+++ b/src/corelib/io/qfilesystemwatcher_win_p.h
@@ -138,7 +138,7 @@ public:
     bool operator==(const QFileSystemWatcherPathKey &other) const { return !compare(other, Qt::CaseInsensitive); }
 };
 
-Q_DECLARE_TYPEINFO(QFileSystemWatcherPathKey, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QFileSystemWatcherPathKey, Q_RELOCATABLE_TYPE);
 
 inline size_t qHash(const QFileSystemWatcherPathKey &key) { return qHash(key.toCaseFolded()); }
 
diff --git a/src/corelib/io/qloggingregistry_p.h b/src/corelib/io/qloggingregistry_p.h
index b581af6c2f..9687a0e20d 100644
--- a/src/corelib/io/qloggingregistry_p.h
+++ b/src/corelib/io/qloggingregistry_p.h
@@ -88,7 +88,7 @@ private:
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QLoggingRule::PatternFlags)
-Q_DECLARE_TYPEINFO(QLoggingRule, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QLoggingRule, Q_RELOCATABLE_TYPE);
 
 class Q_AUTOTEST_EXPORT QLoggingSettingsParser
 {
diff --git a/src/corelib/io/qprocess_p.h b/src/corelib/io/qprocess_p.h
index b04e05114d..1f449bd4c8 100644
--- a/src/corelib/io/qprocess_p.h
+++ b/src/corelib/io/qprocess_p.h
@@ -99,7 +99,7 @@ inline bool operator<(const QProcEnvKey &a, const QProcEnvKey &b)
     return a.compare(b, Qt::CaseInsensitive) < 0;
 }
 
-Q_DECLARE_TYPEINFO(QProcEnvKey, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QProcEnvKey, Q_RELOCATABLE_TYPE);
 
 typedef QString QProcEnvValue;
 #else
@@ -133,7 +133,7 @@ public:
     mutable QByteArray byteValue;
     mutable QString stringValue;
 };
-Q_DECLARE_TYPEINFO(QProcEnvValue, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QProcEnvValue, Q_RELOCATABLE_TYPE);
 #endif
 
 class QProcessEnvironmentPrivate: public QSharedData
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp
index aa144ecadd..a5995df211 100644
--- a/src/corelib/io/qresource.cpp
+++ b/src/corelib/io/qresource.cpp
@@ -194,7 +194,7 @@ static QString cleanPath(const QString &_path)
     return path;
 }
 
-Q_DECLARE_TYPEINFO(QResourceRoot, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QResourceRoot, Q_RELOCATABLE_TYPE);
 
 typedef QList<QResourceRoot*> ResourceList;
 struct QResourceGlobalData
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp
index ac8f54155d..eb18595595 100644
--- a/src/corelib/io/qsettings.cpp
+++ b/src/corelib/io/qsettings.cpp
@@ -108,7 +108,7 @@ struct QConfFileCustomFormat
     QSettings::WriteFunc writeFunc;
     Qt::CaseSensitivity caseSensitivity;
 };
-Q_DECLARE_TYPEINFO(QConfFileCustomFormat, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QConfFileCustomFormat, Q_RELOCATABLE_TYPE);
 
 typedef QHash<QString, QConfFile *> ConfFileHash;
 typedef QCache<QString, QConfFile> ConfFileCache;
@@ -1715,7 +1715,7 @@ public:
 
     int position;
 };
-Q_DECLARE_TYPEINFO(QSettingsIniKey, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QSettingsIniKey, Q_RELOCATABLE_TYPE);
 
 static bool operator<(const QSettingsIniKey &k1, const QSettingsIniKey &k2)
 {
@@ -1734,7 +1734,7 @@ struct QSettingsIniSection
     inline QSettingsIniSection() : position(-1) {}
 };
 
-Q_DECLARE_TYPEINFO(QSettingsIniSection, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QSettingsIniSection, Q_RELOCATABLE_TYPE);
 
 typedef QMap<QString, QSettingsIniSection> IniMap;
 
diff --git a/src/corelib/io/qsettings_p.h b/src/corelib/io/qsettings_p.h
index b70733e7b8..180ac8b2cd 100644
--- a/src/corelib/io/qsettings_p.h
+++ b/src/corelib/io/qsettings_p.h
@@ -108,7 +108,7 @@ private:
 };
 #endif
 
-Q_DECLARE_TYPEINFO(QSettingsKey, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QSettingsKey, Q_RELOCATABLE_TYPE);
 
 typedef QMap<QSettingsKey, QByteArray> UnparsedSettingsMap;
 typedef QMap<QSettingsKey, QVariant> ParsedSettingsMap;
@@ -134,7 +134,7 @@ public:
     int num;
     int maxNum;
 };
-Q_DECLARE_TYPEINFO(QSettingsGroup, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QSettingsGroup, Q_RELOCATABLE_TYPE);
 
 inline QString QSettingsGroup::toString() const
 {
diff --git a/src/corelib/itemmodels/qabstractitemmodel.h b/src/corelib/itemmodels/qabstractitemmodel.h
index 5d4ac59966..9b10106187 100644
--- a/src/corelib/itemmodels/qabstractitemmodel.h
+++ b/src/corelib/itemmodels/qabstractitemmodel.h
@@ -71,7 +71,7 @@ public:
     void clearData() noexcept { m_data.clear(); }
 };
 
-Q_DECLARE_TYPEINFO(QModelRoleData, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QModelRoleData, Q_RELOCATABLE_TYPE);
 
 class QModelRoleDataSpan;
 
@@ -151,7 +151,7 @@ public:
     }
 };
 
-Q_DECLARE_TYPEINFO(QModelRoleDataSpan, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QModelRoleDataSpan, Q_RELOCATABLE_TYPE);
 
 class QAbstractItemModel;
 class QPersistentModelIndex;
@@ -196,7 +196,7 @@ private:
     quintptr i;
     const QAbstractItemModel *m;
 };
-Q_DECLARE_TYPEINFO(QModelIndex, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QModelIndex, Q_RELOCATABLE_TYPE);
 
 #ifndef QT_NO_DEBUG_STREAM
 Q_CORE_EXPORT QDebug operator<<(QDebug, const QModelIndex &);
diff --git a/src/corelib/itemmodels/qabstractitemmodel_p.h b/src/corelib/itemmodels/qabstractitemmodel_p.h
index a2892cea87..dbab493c9c 100644
--- a/src/corelib/itemmodels/qabstractitemmodel_p.h
+++ b/src/corelib/itemmodels/qabstractitemmodel_p.h
@@ -152,7 +152,7 @@ public:
     static bool isVariantLessThan(const QVariant &left, const QVariant &right,
                                   Qt::CaseSensitivity cs = Qt::CaseSensitive, bool isLocaleAware = false);
 };
-Q_DECLARE_TYPEINFO(QAbstractItemModelPrivate::Change, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QAbstractItemModelPrivate::Change, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 
diff --git a/src/corelib/itemmodels/qitemselectionmodel.h b/src/corelib/itemmodels/qitemselectionmodel.h
index f2b608c05c..cf8fadde1b 100644
--- a/src/corelib/itemmodels/qitemselectionmodel.h
+++ b/src/corelib/itemmodels/qitemselectionmodel.h
@@ -112,7 +112,7 @@ public:
 private:
     QPersistentModelIndex tl, br;
 };
-Q_DECLARE_TYPEINFO(QItemSelectionRange, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QItemSelectionRange, Q_RELOCATABLE_TYPE);
 
 class QItemSelection;
 class QItemSelectionModelPrivate;
diff --git a/src/corelib/kernel/qassociativeiterable.h b/src/corelib/kernel/qassociativeiterable.h
index 4a1942fbc9..b940f605b8 100644
--- a/src/corelib/kernel/qassociativeiterable.h
+++ b/src/corelib/kernel/qassociativeiterable.h
@@ -198,9 +198,9 @@ inline QVariantRef<QAssociativeIterator> &QVariantRef<QAssociativeIterator>::ope
     return *this;
 }
 
-Q_DECLARE_TYPEINFO(QAssociativeIterable, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(QAssociativeIterable::iterator, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(QAssociativeIterable::const_iterator, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QAssociativeIterable, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(QAssociativeIterable::iterator, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(QAssociativeIterable::const_iterator, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 
diff --git a/src/corelib/kernel/qbasictimer.h b/src/corelib/kernel/qbasictimer.h
index 64a9acbe6e..6a2728dd56 100644
--- a/src/corelib/kernel/qbasictimer.h
+++ b/src/corelib/kernel/qbasictimer.h
@@ -72,7 +72,7 @@ public:
     void start(int msec, Qt::TimerType timerType, QObject *obj);
     void stop();
 };
-Q_DECLARE_TYPEINFO(QBasicTimer, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QBasicTimer, Q_RELOCATABLE_TYPE);
 
 inline void swap(QBasicTimer &lhs, QBasicTimer &rhs) noexcept { lhs.swap(rhs); }
 
diff --git a/src/corelib/kernel/qmetaobject.h b/src/corelib/kernel/qmetaobject.h
index 2cc334aff3..dd4619dc03 100644
--- a/src/corelib/kernel/qmetaobject.h
+++ b/src/corelib/kernel/qmetaobject.h
@@ -213,7 +213,7 @@ private:
     friend bool operator!=(const QMetaMethod &m1, const QMetaMethod &m2) noexcept
     { return !(m1 == m2); }
 };
-Q_DECLARE_TYPEINFO(QMetaMethod, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QMetaMethod, Q_RELOCATABLE_TYPE);
 
 class Q_CORE_EXPORT QMetaEnum
 {
@@ -270,7 +270,7 @@ private:
     friend struct QMetaObject;
     friend struct QMetaObjectPrivate;
 };
-Q_DECLARE_TYPEINFO(QMetaEnum, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QMetaEnum, Q_RELOCATABLE_TYPE);
 
 class Q_CORE_EXPORT QMetaProperty
 {
@@ -378,7 +378,7 @@ private:
     Data data;
     friend struct QMetaObject;
 };
-Q_DECLARE_TYPEINFO(QMetaClassInfo, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QMetaClassInfo, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 
diff --git a/src/corelib/kernel/qmetaobject_p.h b/src/corelib/kernel/qmetaobject_p.h
index f98185ac81..efc1eafc8f 100644
--- a/src/corelib/kernel/qmetaobject_p.h
+++ b/src/corelib/kernel/qmetaobject_p.h
@@ -161,7 +161,7 @@ private:
     int _type;
     QByteArray _name;
 };
-Q_DECLARE_TYPEINFO(QArgumentType, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QArgumentType, Q_RELOCATABLE_TYPE);
 
 typedef QVarLengthArray<QArgumentType, 10> QArgumentTypeArray;
 
diff --git a/src/corelib/kernel/qmetaobjectbuilder.cpp b/src/corelib/kernel/qmetaobjectbuilder.cpp
index ad7a8ce4ab..f4df791ddf 100644
--- a/src/corelib/kernel/qmetaobjectbuilder.cpp
+++ b/src/corelib/kernel/qmetaobjectbuilder.cpp
@@ -146,7 +146,7 @@ public:
         return signature.left(qMax(signature.indexOf('('), 0));
     }
 };
-Q_DECLARE_TYPEINFO(QMetaMethodBuilderPrivate, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QMetaMethodBuilderPrivate, Q_RELOCATABLE_TYPE);
 
 class QMetaPropertyBuilderPrivate
 {
@@ -183,7 +183,7 @@ public:
             flags &= ~f;
     }
 };
-Q_DECLARE_TYPEINFO(QMetaPropertyBuilderPrivate, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QMetaPropertyBuilderPrivate, Q_RELOCATABLE_TYPE);
 
 class QMetaEnumBuilderPrivate
 {
@@ -200,7 +200,7 @@ public:
     QList<QByteArray> keys;
     QList<int> values;
 };
-Q_DECLARE_TYPEINFO(QMetaEnumBuilderPrivate, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QMetaEnumBuilderPrivate, Q_RELOCATABLE_TYPE);
 
 class QMetaObjectBuilderPrivate
 {
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h
index e453c61d77..de6632ffc6 100644
--- a/src/corelib/kernel/qmetatype.h
+++ b/src/corelib/kernel/qmetatype.h
@@ -709,7 +709,7 @@ public:
     inline void first(void *dataPtr) const { _getFirst(&_pair, dataPtr); }
     inline void second(void *dataPtr) const { _getSecond(&_pair, dataPtr); }
 };
-QT_METATYPE_PRIVATE_DECLARE_TYPEINFO(QPairVariantInterfaceImpl, Q_MOVABLE_TYPE)
+QT_METATYPE_PRIVATE_DECLARE_TYPEINFO(QPairVariantInterfaceImpl, Q_RELOCATABLE_TYPE)
 
 template<typename From>
 struct QPairVariantInterfaceConvertFunctor;
diff --git a/src/corelib/kernel/qmimedata.cpp b/src/corelib/kernel/qmimedata.cpp
index d99874bd67..1ed416e3e8 100644
--- a/src/corelib/kernel/qmimedata.cpp
+++ b/src/corelib/kernel/qmimedata.cpp
@@ -58,7 +58,7 @@ struct QMimeDataStruct
     QString format;
     QVariant data;
 };
-Q_DECLARE_TYPEINFO(QMimeDataStruct, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QMimeDataStruct, Q_RELOCATABLE_TYPE);
 
 class QMimeDataPrivate : public QObjectPrivate
 {
diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h
index 5fc12c3165..79539fbd55 100644
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
@@ -387,7 +387,7 @@ public:
     QBindingStorage bindingStorage;
 };
 
-Q_DECLARE_TYPEINFO(QObjectPrivate::ConnectionList, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QObjectPrivate::ConnectionList, Q_RELOCATABLE_TYPE);
 
 /*
     Catch mixing of incompatible library versions.
@@ -498,8 +498,8 @@ bool QObjectPrivate::disconnect(const typename QtPrivate::FunctionPointer< Func1
                           &SignalType::Object::staticMetaObject);
 }
 
-Q_DECLARE_TYPEINFO(QObjectPrivate::Connection, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(QObjectPrivate::Sender, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QObjectPrivate::Connection, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(QObjectPrivate::Sender, Q_RELOCATABLE_TYPE);
 
 class QSemaphore;
 class Q_CORE_EXPORT QAbstractMetaCallEvent : public QEvent
diff --git a/src/corelib/kernel/qpointer.h b/src/corelib/kernel/qpointer.h
index 30c7d923fd..b877b56133 100644
--- a/src/corelib/kernel/qpointer.h
+++ b/src/corelib/kernel/qpointer.h
@@ -112,7 +112,7 @@ public:
 #undef DECLARE_COMPARE_SET
 #undef DECLARE_TEMPLATE_COMPARE_SET
 };
-template <class T> Q_DECLARE_TYPEINFO_BODY(QPointer<T>, Q_MOVABLE_TYPE);
+template <class T> Q_DECLARE_TYPEINFO_BODY(QPointer<T>, Q_RELOCATABLE_TYPE);
 
 template<typename T>
 QPointer<T>
diff --git a/src/corelib/kernel/qsequentialiterable.h b/src/corelib/kernel/qsequentialiterable.h
index a5a22b55df..8755b07aec 100644
--- 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
index 519600143f..b7f45224ae 100644
--- a/src/corelib/serialization/qxmlstream.h
+++ b/src/corelib/serialization/qxmlstream.h
@@ -103,7 +103,7 @@ public:
         { 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 @@ public:
         { 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 @@ public:
         { 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 @@ public:
         { 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
index 32ecfa0e48..78d95e39fa 100644
--- a/src/corelib/text/qchar.h
+++ b/src/corelib/text/qchar.h
@@ -638,7 +638,7 @@ private:
     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
index 69b6136313..4bad1c698e 100644
--- a/src/corelib/text/qlocale_p.h
+++ b/src/corelib/text/qlocale_p.h
@@ -135,7 +135,7 @@ private:
     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
index c63da7f1d1..76f0e15303 100644
--- a/src/corelib/text/qstring.cpp
+++ b/src/corelib/text/qstring.cpp
@@ -4456,7 +4456,7 @@ public:
     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
index fa4eeb0367..843ee9966e 100644
--- a/src/corelib/text/qstring.h
+++ b/src/corelib/text/qstring.h
@@ -311,7 +311,7 @@ private:
     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
index 6565b5777e..f4c60969ac 100644
--- a/src/corelib/thread/qthread_p.h
+++ b/src/corelib/thread/qthread_p.h
@@ -85,7 +85,7 @@ public:
         : 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
index 7ce7c5f43b..bc8c09b1e9 100644
--- a/src/corelib/time/qdatetime.h
+++ b/src/corelib/time/qdatetime.h
@@ -160,7 +160,7 @@ private:
     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 @@ private:
     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
index 39686f1615..5fd9044ef5 100644
--- a/src/corelib/time/qtimezone.h
+++ b/src/corelib/time/qtimezone.h
@@ -171,7 +171,7 @@ private:
     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
index 19309e04fb..625aba2079 100644
--- a/src/corelib/time/qtimezoneprivate_p.h
+++ b/src/corelib/time/qtimezoneprivate_p.h
@@ -168,7 +168,7 @@ public:
 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
index 99e7484664..8e575be635 100644
--- a/src/corelib/tools/qcommandlineparser.cpp
+++ b/src/corelib/tools/qcommandlineparser.cpp
@@ -126,7 +126,7 @@ public:
     //! 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
index e35de2af6d..4948559509 100644
--- a/src/corelib/tools/qline.h
+++ b/src/corelib/tools/qline.h
@@ -89,7 +89,7 @@ public:
 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 @@ public:
 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
index b0f61eeb66..d947e2da8e 100644
--- a/src/corelib/tools/qmargins.h
+++ b/src/corelib/tools/qmargins.h
@@ -112,7 +112,7 @@ private:
     }
 };
 
-Q_DECLARE_TYPEINFO(QMargins, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QMargins, Q_RELOCATABLE_TYPE);
 
 /*****************************************************************************
   QMargins stream functions
@@ -361,7 +361,7 @@ private:
     }
 };
 
-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
index f2acb9f3ad..118d837d69 100644
--- a/src/corelib/tools/qpoint.h
+++ b/src/corelib/tools/qpoint.h
@@ -129,7 +129,7 @@ private:
     }
 };
 
-Q_DECLARE_TYPEINFO(QPoint, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QPoint, Q_RELOCATABLE_TYPE);
 
 /*****************************************************************************
   QPoint stream functions
@@ -323,7 +323,7 @@ private:
     }
 };
 
-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
index 14cab1137e..da80106e3e 100644
--- a/src/corelib/tools/qrect.h
+++ b/src/corelib/tools/qrect.h
@@ -164,7 +164,7 @@ private:
     int x2;
     int y2;
 };
-Q_DECLARE_TYPEINFO(QRect, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRect, Q_RELOCATABLE_TYPE);
 
 
 /*****************************************************************************
@@ -625,7 +625,7 @@ private:
     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
index 2cd6dd0756..ec8d296a81 100644
--- a/src/corelib/tools/qringbuffer_p.h
+++ b/src/corelib/tools/qringbuffer_p.h
@@ -267,7 +267,7 @@ private:
 };
 
 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
index bda117739c..de11257db3 100644
--- 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
index 53d9a34acb..222aecb018 100644
--- 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
index b2409a4f89..a11169c53c 100644
--- a/src/corelib/tools/qsize.h
+++ b/src/corelib/tools/qsize.h
@@ -113,7 +113,7 @@ private:
     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 @@ private:
     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
index a026e40324..7f530b4b98 100644
--- a/src/corelib/tools/qversionnumber.h
+++ b/src/corelib/tools/qversionnumber.h
@@ -303,7 +303,7 @@ private:
     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 @@ private:
 };
 
 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);
-- 
cgit v1.2.3