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

ProjectExplorer: Base BuildStepList on QObject, not ProjectConfiguration

Browse Source 
The only shared thing is an id, and even that's arguably even better
done by an enum, since there's a fixed set of three of them in that case.

Change-Id: Ia9da858524a5eb44eb91512ce72105249b5a9702
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-07-30 11:29:49 +02:00
parent b8a6f9fa52
commit 8e1f89aca2
3 changed files with 51 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,8 +53,6 @@ DeployConfiguration::DeployConfiguration(Target *target, Core::Id id)
return bc ? bc->macroExpander() : target->macroExpander();
});
//: Display name of the deploy build step list. Used as part of the labels in the project window.
m_stepList.setDefaultDisplayName(tr("Deploy"));
//: Default DeployConfiguration display name
setDefaultDisplayName(tr("Deploy locally"));
}
@@ -100,7 +98,6 @@ bool DeployConfiguration::fromMap(const QVariantMap &map)
m_stepList.clear();
return false;
}
m_stepList.setDefaultDisplayName(tr("Deploy"));
} else {
qWarning() << "No data for deploy step list found!";
return false;
@@ -188,7 +185,11 @@ DeployConfiguration *DeployConfigurationFactory::create(Target *parent)
QTC_ASSERT(canHandle(parent), return nullptr);
DeployConfiguration *dc = createDeployConfiguration(parent);
QTC_ASSERT(dc, return nullptr);
dc->stepList()->appendSteps(m_initialSteps);
BuildStepList *stepList = dc->stepList();
for (const BuildStepList::StepCreationInfo &info : qAsConst(m_initialSteps)) {
if (!info.condition || info.condition(parent))
stepList->appendStep(info.stepId);
}
return dc;
}