From 0440614af0bb08e373d8e3e40f90b6412c043d14 Mon Sep 17 00:00:00 2001 From: Andreas Buhr 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 Reviewed-by: Andrei Golubev --- tests/auto/corelib/tools/qlist/tst_qlist.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/auto/corelib/tools/qlist/tst_qlist.cpp') diff --git a/tests/auto/corelib/tools/qlist/tst_qlist.cpp b/tests/auto/corelib/tools/qlist/tst_qlist.cpp index 37b1e9487f..24dc92c00d 100644 --- a/tests/auto/corelib/tools/qlist/tst_qlist.cpp +++ b/tests/auto/corelib/tools/qlist/tst_qlist.cpp @@ -112,7 +112,7 @@ inline size_t qHash(const Movable &key, size_t seed = 0) { return qHash(key.i, s QAtomicInt Movable::counter = 0; QT_BEGIN_NAMESPACE -Q_DECLARE_TYPEINFO(Movable, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(Movable, Q_RELOCATABLE_TYPE); QT_END_NAMESPACE Q_DECLARE_METATYPE(Movable); -- cgit v1.2.3