From a79957038ad7d761e12a05446e2f9505569d7285 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 7 Aug 2019 12:16:48 +0200 Subject: ProjectExplorer: Replace RunControl::buildTargetInfo ... by two accessors to the only used field. General idea here is to make the presence of a RunConfiguration in a RunControl less prominent to be able to remove it at some time completely, as the configuration's data might change while the control is running. Change-Id: I752540fadd135d6904fc9bf4e3506be074b0c003 Reviewed-by: Christian Kandeler --- src/plugins/winrt/winrtdebugsupport.cpp | 2 +- src/plugins/winrt/winrtrunnerhelper.cpp | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'src/plugins/winrt') diff --git a/src/plugins/winrt/winrtdebugsupport.cpp b/src/plugins/winrt/winrtdebugsupport.cpp index 5c91ee258a0..d409b0cdb0c 100644 --- a/src/plugins/winrt/winrtdebugsupport.cpp +++ b/src/plugins/winrt/winrtdebugsupport.cpp @@ -75,7 +75,7 @@ WinRtDebugSupport::WinRtDebugSupport(RunControl *runControl) setQmlServer(qmlServer); } - setSymbolFile(runControl->buildTargetInfo().targetFilePath); + setSymbolFile(runControl->targetFilePath()); QString errorMessage; m_runner = new WinRtRunnerHelper(this, &errorMessage); if (!errorMessage.isEmpty()) { diff --git a/src/plugins/winrt/winrtrunnerhelper.cpp b/src/plugins/winrt/winrtrunnerhelper.cpp index 3e29aeb9df1..69d718e5757 100644 --- a/src/plugins/winrt/winrtrunnerhelper.cpp +++ b/src/plugins/winrt/winrtrunnerhelper.cpp @@ -69,12 +69,11 @@ WinRtRunnerHelper::WinRtRunnerHelper(ProjectExplorer::RunWorker *runWorker, QStr return; } - const BuildTargetInfo bti = runControl->buildTargetInfo(); - m_executableFilePath = bti.targetFilePath.toString(); + m_executableFilePath = runControl->targetFilePath().toString(); if (m_executableFilePath.isEmpty()) { - *errorMessage = tr("Cannot determine the executable file path for \"%1\".").arg( - QDir::toNativeSeparators(bti.projectFilePath.toString())); + *errorMessage = tr("Cannot determine the executable file path for \"%1\".") + .arg(runControl->projectFilePath().toUserOutput()); return; } -- cgit v1.2.3