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

ProjectExplorer: Return BuildTargetInfo from availableBuildTarget()

Browse Source 
... including build target name and display names instead of
returning QString build target names and producing display names
via displayNameForBuildTarget()

This is a mechanical intermediate step on the road to use
Target::applicationTargets().list uniformly as source of build
targets.

Change-Id: I7b0b1fb398d5061b0cec0b86890f9eaf0bb53a19
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2018-01-03 16:41:40 +01:00
parent 94086e53bd
commit c3d87e81c5
21 changed files with 117 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -454,31 +454,25 @@ QList<RunConfigurationCreationInfo>
if (!canHandle(parent))
return {};
if (m_fixedBuildTargets.isEmpty()) {
return Utils::transform(availableBuildTargets(parent, mode), [this](const QString &suffix) {
return RunConfigurationCreationInfo{this, m_runConfigBaseId, suffix,
this->displayNameForBuildTarget(suffix)};
});
}
QList<RunConfigurationCreationInfo> result;
for (const BuildTargetInfo &bt : m_fixedBuildTargets) {
RunConfigurationCreationInfo rci(this, m_runConfigBaseId, QString(), bt.displayName);
const QList<BuildTargetInfo> buildTargets = m_fixedBuildTargets.isEmpty()
? availableBuildTargets(parent, mode)
: m_fixedBuildTargets;
for (const BuildTargetInfo &bt : buildTargets) {
RunConfigurationCreationInfo rci(this, m_runConfigBaseId, bt.targetName, bt.displayName);
result.append(rci);
}
return result;
}
QList<QString> IRunConfigurationFactory::availableBuildTargets(Target *, CreationMode) const
QList<BuildTargetInfo> IRunConfigurationFactory::availableBuildTargets(Target *, CreationMode) const
{
return {};
}
QString IRunConfigurationFactory::displayNameForBuildTarget(const QString &buildTarget) const
{
return buildTarget;
}
/*!
Specifies a list of device types for which this RunConfigurationFactory