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

MakefileGenerator::processSources() doesn't need to be virtual.

Browse Source 
Only VcprojGenerator over-rode it; and did so with a replacement
identical to the one on the base, so there was no point to it.

Change-Id: I5b899372247809c82b1cae25817e06c5849cd10d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Edward Welbourne 2015-11-11 19:21:27 +01:00
parent d6b45853f5
commit b9ed5b9acf
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qmake/generators/makefile.h
View File

@ -185,7 +185,7 @@ protected:
virtual bool doDepends() const { return Option::mkfile::do_deps; } virtual bool doDepends() const { return Option::mkfile::do_deps; }
void filterIncludedFiles(const char *); void filterIncludedFiles(const char *);
virtual void processSources() { void processSources() {
filterIncludedFiles("SOURCES"); filterIncludedFiles("SOURCES");
filterIncludedFiles("GENERATED_SOURCES"); filterIncludedFiles("GENERATED_SOURCES");
} }

1
qmake/generators/win32/msvc_vcproj.h
View File

@ -75,7 +75,6 @@ public:
protected: protected:
virtual VCProjectWriter *createProjectWriter(); virtual VCProjectWriter *createProjectWriter();
virtual bool doDepends() const { return false; } //never necesary virtual bool doDepends() const { return false; } //never necesary
virtual void processSources() { filterIncludedFiles("SOURCES"); filterIncludedFiles("GENERATED_SOURCES"); }
using Win32MakefileGenerator::replaceExtraCompilerVariables; using Win32MakefileGenerator::replaceExtraCompilerVariables;
virtual QString replaceExtraCompilerVariables(const QString &, const QStringList &, const QStringList &, ReplaceFor); virtual QString replaceExtraCompilerVariables(const QString &, const QStringList &, const QStringList &, ReplaceFor);
virtual bool supportsMetaBuild() { return true; } virtual bool supportsMetaBuild() { return true; }