diff options
| author | Andreas Buhr <andreas@andreasbuhr.de> | 2020-12-08 16:39:17 +0100 |
|---|---|---|
| committer | Andreas Buhr <andreas@andreasbuhr.de> | 2020-12-16 11:20:32 +0100 |
| commit | 0ed931f2602017fb46108011f9b8e1bda3ba45b7 (patch) | |
| tree | ebfe85d916fa079fa4412c1948d739a9861e8c0f /src/qml/qml | |
| parent | 11fc3ecc81767f57dcf87f5c52c822e337ca1214 (diff) | |
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>
Diffstat (limited to 'src/qml/qml')
| -rw-r--r-- | src/qml/qml/ftw/qbitfield_p.h | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmlerror.h | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmlmetatype_p.h | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmlproperty.h | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmlvme_p.h | 2 |
5 files changed, 5 insertions, 5 deletions
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 |