aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/projectexplorer/deployconfiguration.cpp
diff options
context:
space:
mode:
authorhjk <hjk121@nokiamail.com>2014-11-05 14:01:26 +0100
committerhjk <hjk121@nokiamail.com>2014-11-05 14:37:44 +0100
commitf406a38ca75ea56fe71cec7d10dfb2746444017d (patch)
treecb36debc397430a2f103d0c50183382ca89a45a2 /src/plugins/projectexplorer/deployconfiguration.cpp
parent7d417271c3a32aa9baf640127948958d3d252284 (diff)
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>
Diffstat (limited to 'src/plugins/projectexplorer/deployconfiguration.cpp')
-rw-r--r--src/plugins/projectexplorer/deployconfiguration.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/projectexplorer/deployconfiguration.cpp b/src/plugins/projectexplorer/deployconfiguration.cpp
index debe8b0be1..b777a77f9e 100644
--- a/src/plugins/projectexplorer/deployconfiguration.cpp
+++ b/src/plugins/projectexplorer/deployconfiguration.cpp
@@ -53,6 +53,7 @@ DeployConfiguration::DeployConfiguration(Target *target, Core::Id id) :
m_stepList->setDefaultDisplayName(tr("Deploy"));
//: Default DeployConfiguration display name
setDefaultDisplayName(tr("Deploy locally"));
+ macroExpander()->registerSubProvider([target] { return target->macroExpander(); });
}
DeployConfiguration::DeployConfiguration(Target *target, DeployConfiguration *source) :
@@ -63,6 +64,7 @@ DeployConfiguration::DeployConfiguration(Target *target, DeployConfiguration *so
// Do not clone stepLists here, do that in the derived constructor instead
// otherwise BuildStepFactories might reject to set up a BuildStep for us
// since we are not yet the derived class!
+ macroExpander()->registerSubProvider([target] { return target->macroExpander(); });
}
DeployConfiguration::~DeployConfiguration()