From 19580ab203fe65e6653f2a5e1d7ea451d14fb557 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Mon, 26 Aug 2019 17:02:22 +0200
Subject: [PATCH] ProjectExplorer: Less use of stored RunConfiguration in
 RunControl

Change-Id: I501433dcbc3d40c6439f5ab003e06f5a72b9d83e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/projectexplorer/runcontrol.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/plugins/projectexplorer/runcontrol.cpp b/src/plugins/projectexplorer/runcontrol.cpp
index 29d9dc5d263..dbed9e3fb86 100644
--- a/src/plugins/projectexplorer/runcontrol.cpp
+++ b/src/plugins/projectexplorer/runcontrol.cpp
@@ -324,6 +324,7 @@ public:
     Utils::Icon icon;
     MacroExpander *macroExpander;
     QPointer<RunConfiguration> runConfiguration; // Not owned. Avoid use.
+    QString buildKey;
     Core::Id runConfigId;
     Kit *kit = nullptr; // Not owned.
     QPointer<Target> target; // Not owned.
@@ -358,6 +359,7 @@ void RunControl::setRunConfiguration(RunConfiguration *runConfig)
     d->runnable = runConfig->runnable();
     d->displayName = runConfig->displayName();
     d->macroExpander = runConfig->macroExpander();
+    d->buildKey = runConfig->buildKey();
     setTarget(runConfig->target());
 }
 
@@ -895,17 +897,17 @@ ISettingsAspect *RunControl::settings(Core::Id id) const
 
 QString RunControl::buildKey() const
 {
-    return d->runConfiguration ? d->runConfiguration->buildKey() : QString();
+    return d->buildKey;
 }
 
 FilePath RunControl::targetFilePath() const
 {
-    return d->runConfiguration->buildTargetInfo().targetFilePath;
+    return d->target->buildTarget(d->buildKey).targetFilePath;
 }
 
 FilePath RunControl::projectFilePath() const
 {
-    return d->runConfiguration->buildTargetInfo().projectFilePath;
+    return d->target->buildTarget(d->buildKey).projectFilePath;
 }
 
 /*!