From b9ed5b9acf9e79f9d1bc0977fd44750661d09d05 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Wed, 11 Nov 2015 19:21:27 +0100 Subject: [PATCH] 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 --- qmake/generators/makefile.h | 2 +- qmake/generators/win32/msvc_vcproj.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h index 61b8f9ac607..97159eaef44 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 35dc1e89371..50125a30a6d 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; }