From 9ed3a05c59f4e0022ed29e220f9dd8acda7cf37d Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 26 Apr 2018 08:37:56 +0200 Subject: [PATCH] ProjectExplorer: Introduce a RunConfiguration::buildTargetInfo() function As convenience function, and use it in some places. Change-Id: I02e49f2cdc301bbf1261836032d3fa3a5b188446 Reviewed-by: Christian Kandeler --- src/plugins/projectexplorer/runconfiguration.cpp | 5 +++++ src/plugins/projectexplorer/runconfiguration.h | 2 ++ src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp | 4 ++-- .../qmakeprojectmanager/desktopqmakerunconfiguration.cpp | 4 ++-- src/plugins/remotelinux/remotelinuxrunconfiguration.cpp | 2 +- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp index 6cb285d5d0a..b26bcdd64e3 100644 --- a/src/plugins/projectexplorer/runconfiguration.cpp +++ b/src/plugins/projectexplorer/runconfiguration.cpp @@ -380,6 +380,11 @@ Abi RunConfiguration::abi() const return tc->targetAbi(); } +BuildTargetInfo RunConfiguration::buildTargetInfo() const +{ + return target()->applicationTargets().buildTargetInfo(m_buildKey); +} + bool RunConfiguration::fromMap(const QVariantMap &map) { if (!ProjectConfiguration::fromMap(map)) diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h index 751790522d3..8f64fcad56b 100644 --- a/src/plugins/projectexplorer/runconfiguration.h +++ b/src/plugins/projectexplorer/runconfiguration.h @@ -254,6 +254,8 @@ public: // Return a handle to the build system target that created this run configuration. // May return an empty string if no target built the executable! QString buildKey() const { return m_buildKey; } + // The BuildTargetInfo corresponding to the buildKey. + BuildTargetInfo buildTargetInfo() const; void addExtraAspect(IRunConfigurationAspect *aspect); diff --git a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp index 7e7ff8282e1..6c8ef0a5918 100644 --- a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp +++ b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp @@ -117,7 +117,7 @@ void QbsRunConfiguration::addToBaseEnvironment(Utils::Environment &env) const env = it.value(); return; } - BuildTargetInfo bti = target()->applicationTargets().buildTargetInfo(buildKey()); + BuildTargetInfo bti = buildTargetInfo(); if (bti.runEnvModifier) bti.runEnvModifier(env, usingLibraryPaths); m_envCache.insert(key, env); @@ -137,7 +137,7 @@ Utils::FileName QbsRunConfiguration::executableToRun(const BuildTargetInfo &targ void QbsRunConfiguration::updateTargetInformation() { - BuildTargetInfo bti = target()->applicationTargets().buildTargetInfo(buildKey()); + BuildTargetInfo bti = buildTargetInfo(); const FileName executable = executableToRun(bti); auto terminalAspect = extraAspect(); if (!terminalAspect->isUserSet()) diff --git a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp index 15aab8ee319..d8a971fa8b3 100644 --- a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp +++ b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp @@ -97,7 +97,7 @@ void DesktopQmakeRunConfiguration::updateTargetInformation() setDefaultDisplayName(defaultDisplayName()); extraAspect()->buildEnvironmentHasChanged(); - BuildTargetInfo bti = target()->applicationTargets().buildTargetInfo(buildKey()); + BuildTargetInfo bti = buildTargetInfo(); auto wda = extraAspect(); wda->setDefaultWorkingDirectory(bti.workingDirectory); @@ -137,7 +137,7 @@ void DesktopQmakeRunConfiguration::doAdditionalSetup(const RunConfigurationCreat void DesktopQmakeRunConfiguration::addToBaseEnvironment(Environment &env) const { - BuildTargetInfo bti = target()->applicationTargets().buildTargetInfo(buildKey()); + BuildTargetInfo bti = buildTargetInfo(); if (bti.runEnvModifier) bti.runEnvModifier(env, extraAspect()->value()); diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp index 3273092a9ad..981c031d9b2 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp +++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp @@ -93,7 +93,7 @@ QString RemoteLinuxRunConfiguration::defaultDisplayName() const void RemoteLinuxRunConfiguration::updateTargetInformation() { - BuildTargetInfo bti = target()->applicationTargets().buildTargetInfo(buildKey()); + BuildTargetInfo bti = buildTargetInfo(); QString localExecutable = bti.targetFilePath.toString(); DeployableFile depFile = target()->deploymentData().deployableForLocalFile(localExecutable);