From 0440614af0bb08e373d8e3e40f90b6412c043d14 Mon Sep 17 00:00:00 2001
From: Andreas Buhr <andreas.buhr@qt.io>
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 <lars.knoll@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
---
 qmake/generators/makefile.h               | 2 +-
 qmake/generators/win32/msvc_objectmodel.h | 2 +-
 qmake/library/proitems.h                  | 8 ++++----
 qmake/library/qmakeevaluator_p.h          | 2 +-
 qmake/library/qmakeparser.h               | 2 +-
 qmake/main.cpp                            | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'qmake')

diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
index b9f80f5a69..91016ff34d 100644
--- a/qmake/generators/makefile.h
+++ b/qmake/generators/makefile.h
@@ -291,7 +291,7 @@ public:
     QString shellQuote(const QString &str) const;
     virtual ProKey fullTargetVariable() const;
 };
-Q_DECLARE_TYPEINFO(MakefileGenerator::Compiler, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(MakefileGenerator::Compiler, Q_RELOCATABLE_TYPE);
 Q_DECLARE_OPERATORS_FOR_FLAGS(MakefileGenerator::FileFixifyTypes)
 
 inline void MakefileGenerator::setNoIO(bool o)
diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h
index 67310cc33c..84f76ce224 100644
--- a/qmake/generators/win32/msvc_objectmodel.h
+++ b/qmake/generators/win32/msvc_objectmodel.h
@@ -1002,7 +1002,7 @@ public:
     const VCFilter &filterByName(const QString &name) const;
     const VCFilter &filterForExtraCompiler(const QString &compilerName) const;
 };
-Q_DECLARE_TYPEINFO(VCProjectSingleConfig, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(VCProjectSingleConfig, Q_RELOCATABLE_TYPE);
 
 // Tree & Flat view of files --------------------------------------------------
 class VCFilter;
diff --git a/qmake/library/proitems.h b/qmake/library/proitems.h
index 590b976937..6c1d48944a 100644
--- a/qmake/library/proitems.h
+++ b/qmake/library/proitems.h
@@ -190,7 +190,7 @@ private:
     friend QString operator+(const ProString &one, const ProString &two);
     friend class ProKey;
 };
-Q_DECLARE_TYPEINFO(ProString, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(ProString, Q_RELOCATABLE_TYPE);
 
 
 class ProKey : public ProString {
@@ -222,7 +222,7 @@ public:
 private:
     ProKey(const ProString &other);
 };
-Q_DECLARE_TYPEINFO(ProKey, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(ProKey, Q_RELOCATABLE_TYPE);
 
 template <> struct QConcatenable<ProString> : private QAbstractConcatenable
 {
@@ -343,7 +343,7 @@ public:
         { return contains(ProString(str), cs); }
     bool contains(const char *str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
 };
-Q_DECLARE_TYPEINFO(ProStringList, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(ProStringList, Q_RELOCATABLE_TYPE);
 
 inline ProStringList operator+(const ProStringList &one, const ProStringList &two)
     { ProStringList ret = one; ret += two; return ret; }
@@ -496,7 +496,7 @@ private:
     int m_offset;
 };
 
-Q_DECLARE_TYPEINFO(ProFunctionDef, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(ProFunctionDef, Q_RELOCATABLE_TYPE);
 
 struct ProFunctionDefs {
     QHash<ProKey, ProFunctionDef> testFunctions;
diff --git a/qmake/library/qmakeevaluator_p.h b/qmake/library/qmakeevaluator_p.h
index 78ae07e2f1..eb997eebbe 100644
--- a/qmake/library/qmakeevaluator_p.h
+++ b/qmake/library/qmakeevaluator_p.h
@@ -107,7 +107,7 @@ extern QMakeStatics statics;
 
 }
 
-Q_DECLARE_TYPEINFO(QMakeInternal::QMakeBuiltin, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QMakeInternal::QMakeBuiltin, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 
diff --git a/qmake/library/qmakeparser.h b/qmake/library/qmakeparser.h
index db2df43f5a..81aba061bc 100644
--- a/qmake/library/qmakeparser.h
+++ b/qmake/library/qmakeparser.h
@@ -230,7 +230,7 @@ private:
 };
 
 #if !defined(__GNUC__) || __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3)
-Q_DECLARE_TYPEINFO(QMakeParser::BlockScope, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QMakeParser::BlockScope, Q_RELOCATABLE_TYPE);
 Q_DECLARE_TYPEINFO(QMakeParser::Context, Q_PRIMITIVE_TYPE);
 #endif
 
diff --git a/qmake/main.cpp b/qmake/main.cpp
index 37b5ee1c93..3180d5c826 100644
--- a/qmake/main.cpp
+++ b/qmake/main.cpp
@@ -63,7 +63,7 @@ struct SedSubst {
     QRegularExpression from;
     QString to;
 };
-Q_DECLARE_TYPEINFO(SedSubst, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(SedSubst, Q_RELOCATABLE_TYPE);
 
 static int doSed(int argc, char **argv)
 {
-- 
cgit v1.2.3