From 44e97b30554be921e551bf47862e5e7bee070bff Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 3 May 2019 13:29:24 +0200 Subject: [PATCH] ProjectExplorer: Inline convenience overload that was used just once Change-Id: I4b695a07b60df0d197f549657e0ce23ca4fe5ccb Reviewed-by: Christian Kandeler --- .../genericprojectmanager/genericbuildconfiguration.cpp | 2 +- src/plugins/projectexplorer/buildconfiguration.cpp | 4 ---- src/plugins/projectexplorer/buildconfiguration.h | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp b/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp index 764799f8da3..2823c2efab9 100644 --- a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp +++ b/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp @@ -117,7 +117,7 @@ BuildConfiguration::BuildType GenericBuildConfiguration::buildType() const void GenericBuildConfiguration::addToEnvironment(Utils::Environment &env) const { - prependCompilerPathToEnvironment(env); + prependCompilerPathToEnvironment(target()->kit(), env); const QtSupport::BaseQtVersion *qt = QtSupport::QtKitAspect::qtVersion(target()->kit()); if (qt) env.prependOrSetPath(qt->binPath().toString()); diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp index bc448dec0ea..459cbf2ae2f 100644 --- a/src/plugins/projectexplorer/buildconfiguration.cpp +++ b/src/plugins/projectexplorer/buildconfiguration.cpp @@ -373,10 +373,6 @@ bool BuildConfiguration::isActive() const * PATH. This is used to in build configurations targeting broken build systems * to provide hints about which compiler to use. */ -void BuildConfiguration::prependCompilerPathToEnvironment(Utils::Environment &env) const -{ - return prependCompilerPathToEnvironment(target()->kit(), env); -} void BuildConfiguration::prependCompilerPathToEnvironment(Kit *k, Utils::Environment &env) { diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h index ca45342526c..7e6e1553126 100644 --- a/src/plugins/projectexplorer/buildconfiguration.h +++ b/src/plugins/projectexplorer/buildconfiguration.h @@ -95,7 +95,6 @@ public: bool isActive() const override; - void prependCompilerPathToEnvironment(Utils::Environment &env) const; static void prependCompilerPathToEnvironment(Kit *k, Utils::Environment &env); void updateCacheAndEmitEnvironmentChanged();