From 4520f93f2e6ffb4ed1de915aebe2e68f772f6ffd Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 25 May 2022 14:19:27 +0200 Subject: [PATCH] ProjectExplorer: Replace remaining uses of Runnable::device Change-Id: I2d42269eb6ad971fcedb118acb7e6e1dfbff83b2 Reviewed-by: Jarek Kobus Reviewed-by: --- src/plugins/projectexplorer/projectexplorer.cpp | 2 +- src/plugins/projectexplorer/runcontrol.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 0eb12650735..df8a4b35c97 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -3935,7 +3935,7 @@ void ProjectExplorerPluginPrivate::openTerminalHereWithRunEnv() QTC_ASSERT(runConfig, return); const Runnable runnable = runConfig->runnable(); - IDevice::ConstPtr device = runnable.device; + IDevice::ConstPtr device = DeviceManager::deviceForPath(runnable.command.executable()); if (!device) device = DeviceKitAspect::device(target->kit()); QTC_ASSERT(device && device->canOpenTerminal(), return); diff --git a/src/plugins/projectexplorer/runcontrol.cpp b/src/plugins/projectexplorer/runcontrol.cpp index f44ee1d6eeb..d9352444b5f 100644 --- a/src/plugins/projectexplorer/runcontrol.cpp +++ b/src/plugins/projectexplorer/runcontrol.cpp @@ -447,8 +447,8 @@ void RunControl::setKit(Kit *kit) d->kit = kit; d->macroExpander = kit->macroExpander(); - if (d->runnable.device) - setDevice(d->runnable.device); + if (!d->runnable.command.isEmpty()) + setDevice(DeviceManager::deviceForPath(d->runnable.command.executable())); else setDevice(DeviceKitAspect::device(kit)); }