1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qmake: Mark MakefileGenerator::Compiler as Q_MOVABLE_TYPE

Browse Source 
Change-Id: I6469ffe3027c8519e80b71f5014f7bd9474e836b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Marc Mutz 2015-07-22 12:03:02 +02:00
parent d153a0534e
commit b23fb2f07f
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qmake/generators/makefile.h
View File

@ -155,6 +155,8 @@ protected:
}; };
uint flags, type; uint flags, type;
}; };
friend class QTypeInfo<Compiler>;
void initCompiler(const Compiler &comp); void initCompiler(const Compiler &comp);
enum VPATHFlag { enum VPATHFlag {
VPATH_NoFlag = 0x00, VPATH_NoFlag = 0x00,
@ -264,6 +266,7 @@ public:
bool isWindowsShell() const { return Option::dir_sep == QLatin1String("\\"); } bool isWindowsShell() const { return Option::dir_sep == QLatin1String("\\"); }
QString shellQuote(const QString &str); QString shellQuote(const QString &str);
}; };
Q_DECLARE_TYPEINFO(MakefileGenerator::Compiler, Q_MOVABLE_TYPE);
Q_DECLARE_OPERATORS_FOR_FLAGS(MakefileGenerator::FileFixifyTypes) Q_DECLARE_OPERATORS_FOR_FLAGS(MakefileGenerator::FileFixifyTypes)
inline void MakefileGenerator::setNoIO(bool o) inline void MakefileGenerator::setNoIO(bool o)