feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Inline convenience overload that was used just once

Browse Source 
Change-Id: I4b695a07b60df0d197f549657e0ce23ca4fe5ccb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-05-03 13:29:24 +02:00
parent d803a98469
commit 44e97b3055
3 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
View File

@@ -117,7 +117,7 @@ BuildConfiguration::BuildType GenericBuildConfiguration::buildType() const
void GenericBuildConfiguration::addToEnvironment(Utils::Environment &env) const void GenericBuildConfiguration::addToEnvironment(Utils::Environment &env) const
{ {
prependCompilerPathToEnvironment(env); prependCompilerPathToEnvironment(target()->kit(), env);
const QtSupport::BaseQtVersion *qt = QtSupport::QtKitAspect::qtVersion(target()->kit()); const QtSupport::BaseQtVersion *qt = QtSupport::QtKitAspect::qtVersion(target()->kit());
if (qt) if (qt)
env.prependOrSetPath(qt->binPath().toString()); env.prependOrSetPath(qt->binPath().toString());

4
src/plugins/projectexplorer/buildconfiguration.cpp
View File

@@ -373,10 +373,6 @@ bool BuildConfiguration::isActive() const
* PATH. This is used to in build configurations targeting broken build systems * PATH. This is used to in build configurations targeting broken build systems
* to provide hints about which compiler to use. * 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) void BuildConfiguration::prependCompilerPathToEnvironment(Kit *k, Utils::Environment &env)
{ {

1
src/plugins/projectexplorer/buildconfiguration.h
View File

@@ -95,7 +95,6 @@ public:
bool isActive() const override; bool isActive() const override;
void prependCompilerPathToEnvironment(Utils::Environment &env) const;
static void prependCompilerPathToEnvironment(Kit *k, Utils::Environment &env); static void prependCompilerPathToEnvironment(Kit *k, Utils::Environment &env);
void updateCacheAndEmitEnvironmentChanged(); void updateCacheAndEmitEnvironmentChanged();