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

QmakeProject: Make availableBuildTargets return a BuildTargetInfo list

Browse Source 
It's what the "consumer side" expects.

Change-Id: I1a4e75eda09f8626fcf65290e6c58a08eed9fdca
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2018-01-05 12:06:56 +01:00
parent 54160400e9
commit c39eb08ac4
7 changed files with 25 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/qmakeprojectmanager/qmakeproject.cpp
View File

@@ -784,8 +784,8 @@ bool QmakeProject::hasApplicationProFile(const FileName &path) const
return Utils::contains(list, Utils::equal(&QmakeProFile::filePath, path));
}
QList<QString> QmakeProject::buildTargets(IRunConfigurationFactory::CreationMode mode,
const QList<ProjectType> &projectTypes)
QList<BuildTargetInfo> QmakeProject::buildTargets(IRunConfigurationFactory::CreationMode mode,
const QList<ProjectType> &projectTypes)
{
QList<ProjectType> realTypes = projectTypes;
if (realTypes.isEmpty())
@@ -800,7 +800,12 @@ QList<QString> QmakeProject::buildTargets(IRunConfigurationFactory::CreationMode
temp = filtered.isEmpty() ? files : filtered;
}
return Utils::transform(temp, [](QmakeProFile *f) { return f->filePath().toString(); });
return Utils::transform(temp, [](QmakeProFile *f) {
BuildTargetInfo bti;
bti.targetName = f->filePath().toString();
bti.displayName = QFileInfo(bti.targetName).completeBaseName();
return bti;
});
}
void QmakeProject::activeTargetWasChanged()