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

ProjectExplorer: Run Settings: Move environment settings further up

Browse Source 
Adding the global aspects last, not first, more or less
accidentally does the right thing.

Fixes: QTCREATORBUG-22669
Change-Id: Iaf3eb4382974335471fff2f409ea4df7ef8f81b3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-10-01 17:49:33 +02:00
parent 93ec10754f
commit e8d5e6c808
4 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -206,9 +206,6 @@ RunConfiguration::RunConfiguration(Target *target, Core::Id id)
QCoreApplication::translate("ProjectExplorer", "The currently active run configuration's name."),
[this] { return displayName(); }, false);
for (const AspectFactory &factory : theAspectFactories)
m_aspects.append(factory(target));
m_commandLineGetter = [this] {
FilePath executable;
if (const auto executableAspect = aspect<ExecutableAspect>())
@@ -547,17 +544,29 @@ bool RunConfigurationFactory::canHandle(Target *target) const
return true;
}
RunConfiguration *RunConfigurationFactory::create(Target *target) const
{
QTC_ASSERT(m_creator, return nullptr);
RunConfiguration *rc = m_creator(target);
QTC_ASSERT(rc, return nullptr);
// Add the universal aspects.
for (const RunConfiguration::AspectFactory &factory : theAspectFactories)
rc->m_aspects.append(factory(target));
rc->acquaintAspects();
return rc;
}
RunConfiguration *RunConfigurationCreationInfo::create(Target *target) const
{
QTC_ASSERT(factory->canHandle(target), return nullptr);
QTC_ASSERT(id == factory->runConfigurationBaseId(), return nullptr);
QTC_ASSERT(factory->m_creator, return nullptr);
RunConfiguration *rc = factory->m_creator(target);
RunConfiguration *rc = factory->create(target);
if (!rc)
return nullptr;
rc->acquaintAspects();
rc->m_buildKey = buildKey;
rc->doAdditionalSetup(*this);
rc->setDisplayName(displayName);
@@ -571,9 +580,7 @@ RunConfiguration *RunConfigurationFactory::restore(Target *parent, const QVarian
if (factory->canHandle(parent)) {
const Core::Id id = idFromMap(map);
if (id.name().startsWith(factory->m_runConfigBaseId.name())) {
QTC_ASSERT(factory->m_creator, continue);
RunConfiguration *rc = factory->m_creator(parent);
rc->acquaintAspects();
RunConfiguration *rc = factory->create(parent);
if (rc->fromMap(map))
return rc;
delete rc;