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

GenericBuildSystem: Don't store unused expander

Browse Source 
The default value of expander = project()->macroExpander()
was never used, as later it was always overwritten.

Change-Id: Iafaa491c4fb68aa6b9153a3647f6470a2aa293e8
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2022-12-07 18:09:58 +01:00
parent fc6b7996b8
commit 162c8f71d3
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/genericprojectmanager/genericproject.cpp
View File

@@ -513,11 +513,8 @@ GenericBuildSystem::SourceFiles GenericBuildSystem::processEntries(
const Utils::Environment buildEnv = buildConfig ? buildConfig->environment() const Utils::Environment buildEnv = buildConfig ? buildConfig->environment()
: Utils::Environment::systemEnvironment(); : Utils::Environment::systemEnvironment();
const Utils::MacroExpander *expander = project()->macroExpander(); const Utils::MacroExpander *expander = buildConfig ? buildConfig->macroExpander()
if (buildConfig) : target()->macroExpander();
expander = buildConfig->macroExpander();
else
expander = target()->macroExpander();
const QDir projectDir(projectDirectory().toString()); const QDir projectDir(projectDirectory().toString());