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

Provide %{buildDir} macro expansion again.

Browse Source 
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>
This commit is contained in:
hjk
2014-11-05 14:01:26 +01:00
parent 7d417271c3
commit f406a38ca7
5 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/projectexplorer/deployconfiguration.cpp
View File

@@ -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()