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 --- src/corelib/text/qstring.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/corelib/text/qstring.h') diff --git a/src/corelib/text/qstring.h b/src/corelib/text/qstring.h index fa4eeb0367..843ee9966e 100644 --- a/src/corelib/text/qstring.h +++ b/src/corelib/text/qstring.h @@ -311,7 +311,7 @@ private: qsizetype m_size; const char *m_data; }; -Q_DECLARE_TYPEINFO(QLatin1String, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QLatin1String, Q_RELOCATABLE_TYPE); // Qt 4.x compatibility -- cgit v1.2.3