diff options
| author | Edward Welbourne <edward.welbourne@theqtcompany.com> | 2015-11-11 19:21:27 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@theqtcompany.com> | 2015-11-13 15:10:32 +0000 |
| commit | b9ed5b9acf9e79f9d1bc0977fd44750661d09d05 (patch) | |
| tree | 988622600844e01e474b48a8948374c18d5a5e93 /qmake | |
| parent | d6b45853f5d45b5922c93f947d8909855f19a8b9 (diff) | |
MakefileGenerator::processSources() doesn't need to be virtual.
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>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/makefile.h | 2 | ||||
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h index 61b8f9ac60..97159eaef4 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -185,7 +185,7 @@ protected: virtual bool doDepends() const { return Option::mkfile::do_deps; } void filterIncludedFiles(const char *); - virtual void processSources() { + void processSources() { filterIncludedFiles("SOURCES"); filterIncludedFiles("GENERATED_SOURCES"); } diff --git a/qmake/generators/win32/msvc_vcproj.h b/qmake/generators/win32/msvc_vcproj.h index 35dc1e8937..50125a30a6 100644 --- a/qmake/generators/win32/msvc_vcproj.h +++ b/qmake/generators/win32/msvc_vcproj.h @@ -75,7 +75,6 @@ public: protected: virtual VCProjectWriter *createProjectWriter(); virtual bool doDepends() const { return false; } //never necesary - virtual void processSources() { filterIncludedFiles("SOURCES"); filterIncludedFiles("GENERATED_SOURCES"); } using Win32MakefileGenerator::replaceExtraCompilerVariables; virtual QString replaceExtraCompilerVariables(const QString &, const QStringList &, const QStringList &, ReplaceFor); virtual bool supportsMetaBuild() { return true; } |