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

ProjectExplorer: Store some aspect data by value in the RunControl

Browse Source 
Change-Id: Idb7e119b5b0b483ce91efeb21fb415b654cfed4f
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2019-08-27 16:44:42 +02:00
parent c9c214057e
commit 758986ea0e
12 changed files with 47 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/projectexplorer/runcontrol.cpp
View File

@@ -325,6 +325,7 @@ public:
MacroExpander *macroExpander;
QPointer<RunConfiguration> runConfiguration; // Not owned. Avoid use.
QString buildKey;
QMap<Core::Id, QVariantMap> settingsData;
Core::Id runConfigId;
BuildTargetInfo buildTargetInfo;
Kit *kit = nullptr; // Not owned.
@@ -361,6 +362,8 @@ void RunControl::setRunConfiguration(RunConfiguration *runConfig)
d->displayName = runConfig->displayName();
d->macroExpander = runConfig->macroExpander();
d->buildKey = runConfig->buildKey();
d->settingsData = runConfig->aspectData();
setTarget(runConfig->target());
}
@@ -894,9 +897,9 @@ ProjectConfigurationAspect *RunControl::aspect(Core::Id id) const
return d->runConfiguration ? d->runConfiguration->aspect(id) : nullptr;
}
ISettingsAspect *RunControl::settings(Core::Id id) const
QVariantMap RunControl::settingsData(Core::Id id) const
{
return d->runConfiguration ? d->runConfiguration->currentSettings(id) : nullptr;
return d->settingsData.value(id);
}
QString RunControl::buildKey() const