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 QtDeclarative. As the two are synonymous, this
patch should have no impact on users.

Task-number: QTBUG-86829
Change-Id: I5bb418483a3b06619abb4ff62cf0290a7b3bcd4f
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

17 files changed, 23 insertions, 23 deletions

diff --git a/src/qml/common/qqmljsdiagnosticmessage_p.h b/src/qml/common/qqmljsdiagnosticmessage_p.h
index 9f5380ae0c..d5b6190c76 100644
--- a/src/qml/common/qqmljsdiagnosticmessage_p.h
+++ b/src/qml/common/qqmljsdiagnosticmessage_p.h
@@ -86,7 +86,7 @@ struct DiagnosticMessage
 };
 } // namespace QQmlJS
 
-Q_DECLARE_TYPEINFO(QQmlJS::DiagnosticMessage, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QQmlJS::DiagnosticMessage, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 
diff --git a/src/qml/debugger/qqmlprofiler_p.h b/src/qml/debugger/qqmlprofiler_p.h
index d3eedab1c6..f7dc326def 100644
--- a/src/qml/debugger/qqmlprofiler_p.h
+++ b/src/qml/debugger/qqmlprofiler_p.h
@@ -145,7 +145,7 @@ struct Q_AUTOTEST_EXPORT QQmlProfilerData : public QQmlProfilerDefinitions
     RangeType detailType;
 };
 
-Q_DECLARE_TYPEINFO(QQmlProfilerData, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QQmlProfilerData, Q_RELOCATABLE_TYPE);
 
 class Q_QML_PRIVATE_EXPORT QQmlProfiler : public QObject, public QQmlProfilerDefinitions {
     Q_OBJECT
diff --git a/src/qml/jsruntime/qv4profiling_p.h b/src/qml/jsruntime/qv4profiling_p.h
index 497e030b05..d838293ef5 100644
--- a/src/qml/jsruntime/qv4profiling_p.h
+++ b/src/qml/jsruntime/qv4profiling_p.h
@@ -300,11 +300,11 @@ public:
 } // namespace Profiling
 } // namespace QV4
 
-Q_DECLARE_TYPEINFO(QV4::Profiling::MemoryAllocationProperties, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(QV4::Profiling::FunctionCallProperties, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(QV4::Profiling::FunctionCall, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(QV4::Profiling::FunctionLocation, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(QV4::Profiling::Profiler::SentMarker, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QV4::Profiling::MemoryAllocationProperties, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(QV4::Profiling::FunctionCallProperties, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(QV4::Profiling::FunctionCall, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(QV4::Profiling::FunctionLocation, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(QV4::Profiling::Profiler::SentMarker, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 Q_DECLARE_METATYPE(QV4::Profiling::FunctionLocationHash)
diff --git a/src/qml/jsruntime/qv4property_p.h b/src/qml/jsruntime/qv4property_p.h
index 555f323737..86931aab23 100644
--- a/src/qml/jsruntime/qv4property_p.h
+++ b/src/qml/jsruntime/qv4property_p.h
@@ -209,7 +209,7 @@ struct PropertyIndex {
 
 }
 
-Q_DECLARE_TYPEINFO(QV4::Property, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QV4::Property, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 
diff --git a/src/qml/qml/ftw/qbitfield_p.h b/src/qml/qml/ftw/qbitfield_p.h
index 92017580d6..a31aced51a 100644
--- a/src/qml/qml/ftw/qbitfield_p.h
+++ b/src/qml/qml/ftw/qbitfield_p.h
@@ -160,7 +160,7 @@ bool QBitField::testBit(int b) const
     }
 }
 
-Q_DECLARE_TYPEINFO(QBitField, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QBitField, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 
diff --git a/src/qml/qml/qqmlerror.h b/src/qml/qml/qqmlerror.h
index 449328fcd1..53a28b244b 100644
--- a/src/qml/qml/qqmlerror.h
+++ b/src/qml/qml/qqmlerror.h
@@ -83,7 +83,7 @@ private:
 
 QDebug Q_QML_EXPORT operator<<(QDebug debug, const QQmlError &error);
 
-Q_DECLARE_TYPEINFO(QQmlError, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QQmlError, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 
diff --git a/src/qml/qml/qqmlmetatype_p.h b/src/qml/qml/qqmlmetatype_p.h
index e9279b6d97..383952c41e 100644
--- a/src/qml/qml/qqmlmetatype_p.h
+++ b/src/qml/qml/qqmlmetatype_p.h
@@ -264,7 +264,7 @@ public:
     static int qmlRegisteredListTypeCount();
 };
 
-Q_DECLARE_TYPEINFO(QQmlMetaType, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QQmlMetaType, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 
diff --git a/src/qml/qml/qqmlproperty.h b/src/qml/qml/qqmlproperty.h
index 53443bdee4..612d442aec 100644
--- a/src/qml/qml/qqmlproperty.h
+++ b/src/qml/qml/qqmlproperty.h
@@ -133,7 +133,7 @@ inline size_t qHash (const QQmlProperty &key, size_t seed = 0)
     return qHashMulti(seed, key.object(), key.name());
 }
 
-Q_DECLARE_TYPEINFO(QQmlProperty, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QQmlProperty, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 
diff --git a/src/qml/qml/qqmlvme_p.h b/src/qml/qml/qqmlvme_p.h
index 5131a476ab..a3122d8456 100644
--- a/src/qml/qml/qqmlvme_p.h
+++ b/src/qml/qml/qqmlvme_p.h
@@ -92,7 +92,7 @@ namespace QQmlVMETypes {
         QBitField bindingSkipList;
     };
 }
-Q_DECLARE_TYPEINFO(QQmlVMETypes::List, Q_PRIMITIVE_TYPE  | Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QQmlVMETypes::List, Q_PRIMITIVE_TYPE  | Q_RELOCATABLE_TYPE);
 template<>
 class QTypeInfo<QQmlVMETypes::State> : public QTypeInfoMerger<QQmlVMETypes::State, QBitField> {}; //Q_DECLARE_TYPEINFO
 
diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h
index a7e37d1964..928cda716e 100644
--- a/src/qmldebug/qqmlprofilerevent_p.h
+++ b/src/qmldebug/qqmlprofilerevent_p.h
@@ -346,7 +346,7 @@ bool operator!=(const QQmlProfilerEvent &event1, const QQmlProfilerEvent &event2
 QDataStream &operator>>(QDataStream &stream, QQmlProfilerEvent &event);
 QDataStream &operator<<(QDataStream &stream, const QQmlProfilerEvent &event);
 
-Q_DECLARE_TYPEINFO(QQmlProfilerEvent, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QQmlProfilerEvent, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 
diff --git a/src/qmldebug/qqmlprofilereventlocation_p.h b/src/qmldebug/qqmlprofilereventlocation_p.h
index beec3a0eb0..292d9c40ac 100644
--- a/src/qmldebug/qqmlprofilereventlocation_p.h
+++ b/src/qmldebug/qqmlprofilereventlocation_p.h
@@ -114,7 +114,7 @@ inline size_t qHash(const QQmlProfilerEventLocation &location)
 QDataStream &operator>>(QDataStream &stream, QQmlProfilerEventLocation &location);
 QDataStream &operator<<(QDataStream &stream, const QQmlProfilerEventLocation &location);
 
-Q_DECLARE_TYPEINFO(QQmlProfilerEventLocation, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QQmlProfilerEventLocation, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 
diff --git a/src/qmldebug/qqmlprofilereventtype_p.h b/src/qmldebug/qqmlprofilereventtype_p.h
index c89115be83..0bce05d9c8 100644
--- a/src/qmldebug/qqmlprofilereventtype_p.h
+++ b/src/qmldebug/qqmlprofilereventtype_p.h
@@ -116,7 +116,7 @@ inline bool operator!=(const QQmlProfilerEventType &type1, const QQmlProfilerEve
     return !(type1 == type2);
 }
 
-Q_DECLARE_TYPEINFO(QQmlProfilerEventType, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QQmlProfilerEventType, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 
diff --git a/src/qmldebug/qqmlprofilertypedevent_p.h b/src/qmldebug/qqmlprofilertypedevent_p.h
index e7e947f2ef..67819866bf 100644
--- a/src/qmldebug/qqmlprofilertypedevent_p.h
+++ b/src/qmldebug/qqmlprofilertypedevent_p.h
@@ -67,7 +67,7 @@ struct QQmlProfilerTypedEvent
 
 QDataStream &operator>>(QDataStream &stream, QQmlProfilerTypedEvent &event);
 
-Q_DECLARE_TYPEINFO(QQmlProfilerTypedEvent, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QQmlProfilerTypedEvent, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 
diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h b/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
index bff9547207..e94fc3866e 100644
--- a/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
+++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
@@ -1015,9 +1015,9 @@ void StencilClipState::reset()
 
 }
 
-Q_DECLARE_TYPEINFO(QSGBatchRenderer::GraphicsState, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(QSGBatchRenderer::GraphicsPipelineStateKey, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(QSGBatchRenderer::RenderPassState, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QSGBatchRenderer::GraphicsState, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(QSGBatchRenderer::GraphicsPipelineStateKey, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(QSGBatchRenderer::RenderPassState, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 
diff --git a/src/quick/scenegraph/coreapi/qsgmaterialshader_p.h b/src/quick/scenegraph/coreapi/qsgmaterialshader_p.h
index 4104e32dbc..42d1635c84 100644
--- a/src/quick/scenegraph/coreapi/qsgmaterialshader_p.h
+++ b/src/quick/scenegraph/coreapi/qsgmaterialshader_p.h
@@ -107,7 +107,7 @@ public:
     QRhiSampler *samplerBindingTable[MAX_SHADER_RESOURCE_BINDINGS];
 };
 
-Q_DECLARE_TYPEINFO(QSGMaterialShaderPrivate::ShaderStageData, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QSGMaterialShaderPrivate::ShaderStageData, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 
diff --git a/src/quick/scenegraph/coreapi/qsgtexture_p.h b/src/quick/scenegraph/coreapi/qsgtexture_p.h
index 723c612fb8..740dc1f3ac 100644
--- a/src/quick/scenegraph/coreapi/qsgtexture_p.h
+++ b/src/quick/scenegraph/coreapi/qsgtexture_p.h
@@ -68,7 +68,7 @@ struct QSGSamplerDescription
     static QSGSamplerDescription fromTexture(QSGTexture *t);
 };
 
-Q_DECLARE_TYPEINFO(QSGSamplerDescription, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QSGSamplerDescription, Q_RELOCATABLE_TYPE);
 
 bool operator==(const QSGSamplerDescription &a, const QSGSamplerDescription &b) noexcept;
 bool operator!=(const QSGSamplerDescription &a, const QSGSamplerDescription &b) noexcept;
diff --git a/src/quick/util/qquickprofiler_p.h b/src/quick/util/qquickprofiler_p.h
index 28b058c2e8..8cbd58761a 100644
--- a/src/quick/util/qquickprofiler_p.h
+++ b/src/quick/util/qquickprofiler_p.h
@@ -146,7 +146,7 @@ struct Q_AUTOTEST_EXPORT QQuickProfilerData
     };
 };
 
-Q_DECLARE_TYPEINFO(QQuickProfilerData, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QQuickProfilerData, Q_RELOCATABLE_TYPE);
 
 class QQuickProfilerSceneGraphData : public QQmlProfilerDefinitions {
 private: