diff options
| author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-04-21 15:24:24 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-04-27 13:25:27 +0000 |
| commit | fc08ac53a0d0c6d8a21e8372370fa7548857da37 (patch) | |
| tree | 22959efd7acb87b93dab4c71a5ad444d18cc1b07 /qmake | |
| parent | 3753667b2b7384277650323b35e07c877e241d3a (diff) | |
remove superfluous method re-implementation
Remove a superfluous implementation of
VcprojGenerator::replaceExtraCompilerVariables.
The implementation in the base class is exactly the same.
Use that instead.
Change-Id: Ie7d995be1b0d55fbefd15ae6b7a992237d97839c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.h b/qmake/generators/win32/msvc_vcproj.h index 3f99e02e92..35dc1e8937 100644 --- a/qmake/generators/win32/msvc_vcproj.h +++ b/qmake/generators/win32/msvc_vcproj.h @@ -76,10 +76,8 @@ protected: virtual VCProjectWriter *createProjectWriter(); virtual bool doDepends() const { return false; } //never necesary virtual void processSources() { filterIncludedFiles("SOURCES"); filterIncludedFiles("GENERATED_SOURCES"); } - using MakefileGenerator::ReplaceFor; + using Win32MakefileGenerator::replaceExtraCompilerVariables; virtual QString replaceExtraCompilerVariables(const QString &, const QStringList &, const QStringList &, ReplaceFor); - inline QString replaceExtraCompilerVariables(const QString &val, const QString &in, const QString &out, ReplaceFor forShell) - { return MakefileGenerator::replaceExtraCompilerVariables(val, in, out, forShell); } virtual bool supportsMetaBuild() { return true; } virtual bool supportsMergedBuilds() { return true; } virtual bool mergeBuildProject(MakefileGenerator *other); |