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/qmldebug | |
| 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/qmldebug')
| -rw-r--r-- | src/qmldebug/qqmlprofilerevent_p.h | 2 | ||||
| -rw-r--r-- | src/qmldebug/qqmlprofilereventlocation_p.h | 2 | ||||
| -rw-r--r-- | src/qmldebug/qqmlprofilereventtype_p.h | 2 | ||||
| -rw-r--r-- | src/qmldebug/qqmlprofilertypedevent_p.h | 2 |
4 files changed, 4 insertions, 4 deletions
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 |