From 41751755881f88cea4bc534b650605bb944cde18 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Tue, 20 Oct 2020 10:35:56 +0200
Subject: [PATCH] Rename the QMetaType::MovableType flag to RelocatableType

Keep this in sync with the changes we have done in QTypeInfo.

Change-Id: Iaacb0f3cc5c46d3486084a1f6eca480a233d5e1a
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
---
 src/corelib/kernel/qmetatype.cpp                        | 3 ++-
 src/corelib/kernel/qmetatype.h                          | 7 +++++--
 src/dbus/qdbusmetaobject.cpp                            | 2 +-
 tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp   | 4 ++--
 tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp | 2 +-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp
index 307dc7a58d..4cf1ac6548 100644
--- a/src/corelib/kernel/qmetatype.cpp
+++ b/src/corelib/kernel/qmetatype.cpp
@@ -409,7 +409,8 @@ Q_GLOBAL_STATIC(QMetaTypeCustomRegistry, customTypeRegistry)
 
     \value NeedsConstruction This type has non-trivial constructors. If the flag is not set instances can be safely initialized with memset to 0.
     \value NeedsDestruction This type has a non-trivial destructor. If the flag is not set calls to the destructor are not necessary before discarding objects.
-    \value MovableType An instance of a type having this attribute can be safely moved by memcpy.
+    \value ReloctableType An instance of a type having this attribute can be safely moved to a different memory location using memcpy.
+    \omitvalue MovableType
     \omitvalue SharedPointerToQObject
     \value IsEnumeration This type is an enumeration.
     \value IsUnsignedEnumeration If the type is an Enumeration, its underlying type is unsigned.
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h
index 5eb89e8552..4e8bae2316 100644
--- a/src/corelib/kernel/qmetatype.h
+++ b/src/corelib/kernel/qmetatype.h
@@ -349,7 +349,10 @@ public:
     enum TypeFlag {
         NeedsConstruction = 0x1,
         NeedsDestruction = 0x2,
-        MovableType = 0x4,
+        RelocatableType = 0x4,
+#if QT_DEPRECATED_SINCE(6, 0)
+        MovableType Q_DECL_ENUMERATOR_DEPRECATED_X("Use RelocatableType instead.") = RelocatableType,
+#endif
         PointerToQObject = 0x8,
         IsEnumeration = 0x10,
         SharedPointerToQObject = 0x20,
@@ -1067,7 +1070,7 @@ namespace QtPrivate {
     template<typename T>
     struct QMetaTypeTypeFlags
     {
-        enum { Flags = (QTypeInfo<T>::isRelocatable ? QMetaType::MovableType : 0)
+        enum { Flags = (QTypeInfo<T>::isRelocatable ? QMetaType::RelocatableType : 0)
                      | (QTypeInfo<T>::isComplex ? QMetaType::NeedsConstruction : 0)
                      | (QTypeInfo<T>::isComplex ? QMetaType::NeedsDestruction : 0)
                      | (IsPointerToTypeDerivedFromQObject<T>::Value ? QMetaType::PointerToQObject : 0)
diff --git a/src/dbus/qdbusmetaobject.cpp b/src/dbus/qdbusmetaobject.cpp
index 8ca5e0b5ba..90a50cc600 100644
--- a/src/dbus/qdbusmetaobject.cpp
+++ b/src/dbus/qdbusmetaobject.cpp
@@ -134,7 +134,7 @@ static int registerComplexDBusType(const QByteArray &typeName)
         const QByteArray name;
         QDBusRawTypeHandler(const QByteArray &name)
             : QtPrivate::QMetaTypeInterface {
-                0, sizeof(void *), sizeof(void *), QMetaType::MovableType, 0, nullptr,
+                0, sizeof(void *), sizeof(void *), QMetaType::RelocatableType, 0, nullptr,
                 name.constData(),
                 nullptr, nullptr, nullptr, nullptr,
                 nullptr, nullptr, nullptr,
diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
index f9c7636435..a074ca5a51 100644
--- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
+++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
@@ -1125,7 +1125,7 @@ void tst_QMetaType::flags()
 
     QCOMPARE(bool(QMetaType::typeFlags(type) & QMetaType::NeedsConstruction), isComplex);
     QCOMPARE(bool(QMetaType::typeFlags(type) & QMetaType::NeedsDestruction), isComplex);
-    QCOMPARE(bool(QMetaType::typeFlags(type) & QMetaType::MovableType), isMovable);
+    QCOMPARE(bool(QMetaType::typeFlags(type) & QMetaType::RelocatableType), isMovable);
     QCOMPARE(bool(QMetaType::typeFlags(type) & QMetaType::PointerToQObject), isPointerToQObject);
     QCOMPARE(bool(QMetaType::typeFlags(type) & QMetaType::IsEnumeration), isEnum);
 }
@@ -1144,7 +1144,7 @@ void tst_QMetaType::flagsStaticLess()
     int flags = QMetaType(type).flags();
     QCOMPARE(bool(flags & QMetaType::NeedsConstruction), isComplex);
     QCOMPARE(bool(flags & QMetaType::NeedsDestruction), isComplex);
-    QCOMPARE(bool(flags & QMetaType::MovableType), isMovable);
+    QCOMPARE(bool(flags & QMetaType::RelocatableType), isMovable);
 }
 
 void tst_QMetaType::flagsBinaryCompatibility6_0_data()
diff --git a/tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp b/tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp
index be34fa7639..dc91b8792b 100644
--- a/tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp
+++ b/tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp
@@ -338,7 +338,7 @@ void tst_QGuiMetaType::flags()
 
     QCOMPARE(bool(QMetaType(type).flags() & QMetaType::NeedsConstruction), isComplex);
     QCOMPARE(bool(QMetaType(type).flags() & QMetaType::NeedsDestruction), isComplex);
-    QCOMPARE(bool(QMetaType(type).flags() & QMetaType::MovableType), isRelocatable);
+    QCOMPARE(bool(QMetaType(type).flags() & QMetaType::RelocatableType), isRelocatable);
 }