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

ProjectExplorer: Remove Target::applicationTargets()

Browse Source 
That's BuildSystem::applicationTargets() nowadays.

Change-Id: I01cf0a491e4cb289af08f529fd15c85bfcdf5493
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2020-03-23 14:14:03 +01:00
parent 08e5e84c9d
commit dd980e23f8
6 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/autotest/testconfiguration.cpp
View File

@@ -31,6 +31,7 @@
#include <cpptools/projectinfo.h>
#include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/buildsystem.h>
#include <projectexplorer/buildtargetinfo.h>
#include <projectexplorer/deploymentdata.h>
#include <projectexplorer/environmentaspect.h>
@@ -137,8 +138,9 @@ void TestConfiguration::completeTestInformation(TestRunMode runMode)
const QSet<QString> buildSystemTargets = m_buildTargets;
qCDebug(LOG) << "BuildSystemTargets\n " << buildSystemTargets;
const QList<BuildTargetInfo> buildTargets = target->buildSystem()->applicationTargets();
BuildTargetInfo targetInfo
= Utils::findOrDefault(target->applicationTargets(),
= Utils::findOrDefault(buildTargets,
[&buildSystemTargets] (const BuildTargetInfo &bti) {
return buildSystemTargets.contains(bti.buildKey);
});
@@ -146,7 +148,6 @@ void TestConfiguration::completeTestInformation(TestRunMode runMode)
// there would be no BuildTargetInfo that could match
if (targetInfo.targetFilePath.isEmpty()) {
qCDebug(LOG) << "BuildTargetInfos";
const QList<BuildTargetInfo> buildTargets = target->applicationTargets();
// if there is only one build target just use it (but be honest that we're deducing)
if (buildTargets.size() == 1) {
targetInfo = buildTargets.first();

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

@@ -445,17 +445,17 @@ QString RunConfigurationFactory::decoratedTargetName(const QString &targetName,
}
QList<RunConfigurationCreationInfo>
RunConfigurationFactory::availableCreators(Target *parent) const
RunConfigurationFactory::availableCreators(Target *target) const
{
const QList<BuildTargetInfo> buildTargets = parent->applicationTargets();
const QList<BuildTargetInfo> buildTargets = target->buildSystem()->applicationTargets();
const bool hasAnyQtcRunnable = Utils::anyOf(buildTargets,
Utils::equal(&BuildTargetInfo::isQtcRunnable, true));
return Utils::transform(buildTargets, [&](const BuildTargetInfo &ti) {
QString displayName = ti.displayName;
if (displayName.isEmpty())
displayName = decoratedTargetName(ti.buildKey, parent);
displayName = decoratedTargetName(ti.buildKey, target);
else if (m_decorateDisplayNames)
displayName = decoratedTargetName(displayName, parent);
displayName = decoratedTargetName(displayName, target);
RunConfigurationCreationInfo rci;
rci.factory = this;
rci.id = m_runConfigBaseId;

2
src/plugins/projectexplorer/runconfiguration.h
View File

@@ -236,7 +236,7 @@ public:
static QString decoratedTargetName(const QString &targetName, Target *kit);
protected:
virtual QList<RunConfigurationCreationInfo> availableCreators(Target *parent) const;
virtual QList<RunConfigurationCreationInfo> availableCreators(Target *target) const;
using RunConfigurationCreator = std::function<RunConfiguration *(Target *)>;

6
src/plugins/projectexplorer/target.cpp
View File

@@ -232,12 +232,6 @@ DeploymentData Target::buildSystemDeploymentData() const
return buildSystem()->deploymentData();
}
const QList<BuildTargetInfo> Target::applicationTargets() const
{
QTC_ASSERT(buildSystem(), return {});
return buildSystem()->applicationTargets();
}
BuildTargetInfo Target::buildTarget(const QString &buildKey) const
{
QTC_ASSERT(buildSystem(), return {});

1
src/plugins/projectexplorer/target.h
View File

@@ -121,7 +121,6 @@ public:
DeploymentData deploymentData() const;
DeploymentData buildSystemDeploymentData() const;
const QList<BuildTargetInfo> applicationTargets() const;
BuildTargetInfo buildTarget(const QString &buildKey) const;
signals:

4
src/plugins/qmljstools/qmljsmodelmanager.cpp
View File

@@ -37,6 +37,7 @@
#include <cpptools/cppmodelmanager.h>
#include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/buildsystem.h>
#include <projectexplorer/project.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/projectnodes.h>
@@ -44,6 +45,7 @@
#include <projectexplorer/runconfiguration.h>
#include <projectexplorer/session.h>
#include <projectexplorer/target.h>
#include <qmljs/qmljsbind.h>
#include <qmljs/qmljsfindexportedcpptypes.h>
#include <qmljs/qmljsplugindumper.h>
@@ -141,7 +143,7 @@ ModelManagerInterface::ProjectInfo ModelManager::defaultProjectInfoForProject(
projectInfo.qmlDumpEnvironment.appendOrSet("QML2_IMPORT_PATH", bc->environment().expandedValueForKey("QML2_IMPORT_PATH"), ":");
}
const auto appTargets = activeTarget->applicationTargets();
const auto appTargets = activeTarget->buildSystem()->applicationTargets();
for (const auto &target : appTargets) {
if (target.targetFilePath.isEmpty())
continue;