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

ProjectExplorer: Remove BuildTargetInfoList wrapper class

Browse Source 
Change-Id: I1a2ae06ec8c5b7278abca2386834d7edd31597d7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-05-03 17:26:49 +02:00
parent f3b6d60a01
commit ce449e4219
13 changed files with 27 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -192,9 +192,9 @@ bool CMakeBuildConfiguration::isParsing() const
return project()->isParsing() && isActive();
}
BuildTargetInfoList CMakeBuildConfiguration::appTargets() const
const QList<BuildTargetInfo> CMakeBuildConfiguration::appTargets() const
{
BuildTargetInfoList appTargetList;
QList<BuildTargetInfo> appTargetList;
bool forAndroid = DeviceTypeKitAspect::deviceTypeId(target()->kit()) == Android::Constants::ANDROID_DEVICE_TYPE;
for (const CMakeBuildTarget &ct : m_buildTargets) {
if (ct.targetType == UtilityType)
@@ -208,7 +208,7 @@ BuildTargetInfoList CMakeBuildConfiguration::appTargets() const
bti.projectFilePath.appendString('/');
bti.workingDirectory = ct.workingDirectory;
bti.buildKey = CMakeTargetNode::generateId(ct.sourceDirectory, ct.title);
appTargetList.list.append(bti);
appTargetList.append(bti);
}
}

2
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
View File

@@ -64,7 +64,7 @@ public:
QStringList buildTargetTitles() const;
const QList<CMakeBuildTarget> &buildTargets() const;
ProjectExplorer::BuildTargetInfoList appTargets() const;
const QList<ProjectExplorer::BuildTargetInfo> appTargets() const;
ProjectExplorer::DeploymentData deploymentData() const;
static Utils::FileName

2
src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
View File

@@ -78,7 +78,7 @@ void CMakeRunConfiguration::doAdditionalSetup(const RunConfigurationCreationInfo
bool CMakeRunConfiguration::isBuildTargetValid() const
{
return Utils::anyOf(target()->applicationTargets().list, [this](const BuildTargetInfo &bti) {
return Utils::anyOf(target()->applicationTargets(), [this](const BuildTargetInfo &bti) {
return bti.buildKey == buildKey();
});
}