From 60f18b6170b7db446754bd9901c809ca69747345 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Wed, 13 Mar 2019 18:09:27 +0100
Subject: [PATCH] Limit scope of uses of RunControl::runConfiguration()

Change-Id: Iccd9c0ce869060367db606b3c338bf21b2299548
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
---
 src/plugins/baremetal/baremetaldebugsupport.cpp | 6 ++----
 src/plugins/qmlpreview/qmlpreviewruncontrol.cpp | 8 ++++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/plugins/baremetal/baremetaldebugsupport.cpp b/src/plugins/baremetal/baremetaldebugsupport.cpp
index 2c23dba31f6..eac145bcbeb 100644
--- a/src/plugins/baremetal/baremetaldebugsupport.cpp
+++ b/src/plugins/baremetal/baremetaldebugsupport.cpp
@@ -122,10 +122,8 @@ void BareMetalDebugSupport::start()
 
     Runnable inferior;
     inferior.executable = bin;
-    if (auto aspect = runControl()->aspect<ArgumentsAspect>()) {
-        const auto rc = runControl()->runConfiguration();
-        inferior.commandLineArguments = aspect->arguments(rc->macroExpander());
-    }
+    if (auto aspect = runControl()->aspect<ArgumentsAspect>())
+        inferior.commandLineArguments = aspect->arguments(runControl()->macroExpander());
     setInferior(inferior);
     setSymbolFile(bin);
     setStartMode(AttachToRemoteServer);
diff --git a/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp b/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp
index 6d540c184b6..81532553db9 100644
--- a/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp
+++ b/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp
@@ -74,14 +74,14 @@ QmlPreviewRunner::QmlPreviewRunner(ProjectExplorer::RunControl *runControl,
     });
 
     connect(m_connectionManager.data(), &Internal::QmlPreviewConnectionManager::restart,
-            runControl, [runControl, this]() {
+            runControl, [runControl]() {
         if (!runControl->isRunning())
             return;
 
-        ProjectExplorer::RunConfiguration *runConfig = runControl->runConfiguration();
-        connect(runControl, &ProjectExplorer::RunControl::stopped, runConfig, [runConfig](){
+        connect(runControl, &ProjectExplorer::RunControl::stopped, runControl, [runControl]() {
             ProjectExplorer::ProjectExplorerPlugin::runRunConfiguration(
-                        runConfig, ProjectExplorer::Constants::QML_PREVIEW_RUN_MODE, true);
+                        runControl->runConfiguration(),
+                        ProjectExplorer::Constants::QML_PREVIEW_RUN_MODE, true);
         });
 
         runControl->initiateStop();