diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2022-12-07 18:09:58 +0100 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2022-12-09 11:40:56 +0000 |
| commit | 162c8f71d3cd9ec7853ea4bbf8d4bc4c84cff88f (patch) | |
| tree | a980d0b5901ec4b5236bdaa2151bdabfcbf6b59c /src/plugins/genericprojectmanager | |
| parent | fc6b7996b8877532b3dbb1580e6e371a6d29eaeb (diff) | |
| download | qt-creator-162c8f71d3cd9ec7853ea4bbf8d4bc4c84cff88f.tar.gz | |
GenericBuildSystem: Don't store unused expander
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>
Diffstat (limited to 'src/plugins/genericprojectmanager')
| -rw-r--r-- | src/plugins/genericprojectmanager/genericproject.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index c9b56a142a..771fc23553 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -513,11 +513,8 @@ GenericBuildSystem::SourceFiles GenericBuildSystem::processEntries( const Utils::Environment buildEnv = buildConfig ? buildConfig->environment() : Utils::Environment::systemEnvironment(); - const Utils::MacroExpander *expander = project()->macroExpander(); - if (buildConfig) - expander = buildConfig->macroExpander(); - else - expander = target()->macroExpander(); + const Utils::MacroExpander *expander = buildConfig ? buildConfig->macroExpander() + : target()->macroExpander(); const QDir projectDir(projectDirectory().toString()); |