From 162c8f71d3cd9ec7853ea4bbf8d4bc4c84cff88f Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Wed, 7 Dec 2022 18:09:58 +0100
Subject: [PATCH] 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>
---
 src/plugins/genericprojectmanager/genericproject.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index c9b56a142ad..771fc235539 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());