feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Replace remaining uses of Runnable::device

Browse Source 
Change-Id: I2d42269eb6ad971fcedb118acb7e6e1dfbff83b2
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
hjk
2022-05-25 14:19:27 +02:00
parent 3653456c4f
commit 4520f93f2e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/projectexplorer/projectexplorer.cpp
View File

@@ -3935,7 +3935,7 @@ void ProjectExplorerPluginPrivate::openTerminalHereWithRunEnv()
QTC_ASSERT(runConfig, return); QTC_ASSERT(runConfig, return);
const Runnable runnable = runConfig->runnable(); const Runnable runnable = runConfig->runnable();
IDevice::ConstPtr device = runnable.device; IDevice::ConstPtr device = DeviceManager::deviceForPath(runnable.command.executable());
if (!device) if (!device)
device = DeviceKitAspect::device(target->kit()); device = DeviceKitAspect::device(target->kit());
QTC_ASSERT(device && device->canOpenTerminal(), return); QTC_ASSERT(device && device->canOpenTerminal(), return);

4
src/plugins/projectexplorer/runcontrol.cpp
View File

@@ -447,8 +447,8 @@ void RunControl::setKit(Kit *kit)
d->kit = kit; d->kit = kit;
d->macroExpander = kit->macroExpander(); d->macroExpander = kit->macroExpander();
if (d->runnable.device) if (!d->runnable.command.isEmpty())
setDevice(d->runnable.device); setDevice(DeviceManager::deviceForPath(d->runnable.command.executable()));
else else
setDevice(DeviceKitAspect::device(kit)); setDevice(DeviceKitAspect::device(kit));
} }