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

Set up hierarchy of ProjectConfiguration macro expanders.

Browse Source 
BuildConfiguration asks Target,
Deploy and Run ask either activeBuild, or Target.

Change-Id: I3845cfbd16de7b85268d83b5324865ff24482152
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
hjk
2014-11-05 15:45:56 +01:00
parent d8edeb1e38
commit b94a6a0537
8 changed files with 46 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/projectexplorer/runconfiguration.cpp
View File

@@ -254,7 +254,13 @@ void RunConfiguration::ctor()
{
connect(this, SIGNAL(enabledChanged()), this, SIGNAL(requestRunActionsUpdate()));
macroExpander()->registerSubProvider([this] { return target()->macroExpander(); });
Utils::MacroExpander *expander = macroExpander();
expander->setDisplayName(tr("Run Settings"));
expander->setAccumulating(true);
expander->registerSubProvider([this]() -> Utils::MacroExpander * {
BuildConfiguration *bc = target()->activeBuildConfiguration();
return bc ? bc->macroExpander() : target()->macroExpander();
});
}
/*!