Provide %{buildDir} macro expansion again.

This was a regression introduced during the macro expander rework.

Task-number: QTCREATORBUG-13260
Change-Id: I9fd28c6a522faa11992931f937dd0b0eb779f419
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>

1 files changed, 3 insertions, 22 deletions

diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp
index 7ae211d4a7..b157ba3d93 100644
--- a/src/plugins/projectexplorer/buildconfiguration.cpp
+++ b/src/plugins/projectexplorer/buildconfiguration.cpp
@@ -75,6 +75,8 @@ BuildConfiguration::BuildConfiguration(Target *target, Core::Id id) :
     connect(target, SIGNAL(kitChanged()),
             this, SLOT(handleKitUpdate()));
     connect(this, SIGNAL(environmentChanged()), this, SLOT(emitBuildDirectoryChanged()));
+
+    macroExpander()->registerSubProvider([target] { return target->macroExpander(); });
 }
 
 BuildConfiguration::BuildConfiguration(Target *target, BuildConfiguration *source) :
@@ -92,29 +94,8 @@ BuildConfiguration::BuildConfiguration(Target *target, BuildConfiguration *sourc
 
     connect(target, SIGNAL(kitChanged()),
             this, SLOT(handleKitUpdate()));
-}
-
-void BuildConfiguration::setupMacroExpander()
-{
-    Utils::MacroExpander *expander = macroExpander();
-
-    expander->registerSubProvider(
-            [this] { return target()->kit()->macroExpander(); });
-
-    // Legacy support.
-    expander->registerVariable(Constants::VAR_CURRENTPROJECT_NAME,
-            QCoreApplication::translate("ProjectExplorer", "Name of current project"),
-            [this] { return target()->project()->displayName(); });
-
-    expander->registerVariable(Constants::VAR_CURRENTBUILD_NAME,
-            QCoreApplication::translate("ProjectExplorer", "Name of current build"),
-            [this] { return displayName(); });
-
-    expander->registerVariable("sourceDir", tr("Source directory"),
-            [this] { return target()->project()->projectDirectory().toUserOutput(); });
 
-    expander->registerVariable("buildDir", tr("Build directory"),
-            [this] { return buildDirectory().toUserOutput(); });
+    macroExpander()->registerSubProvider([target] { return target->macroExpander(); });
 }
 
 BuildConfiguration::~BuildConfiguration()