From 2af3b41ad60e7266fc2c27d237aa4792dba01d5b Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 25 May 2022 13:53:21 +0200 Subject: [PATCH] ProjectExplorer: Replace some uses of Runnable::device Change-Id: I76ccbe9a56b9ecdc07fc85885b34f2a31c69fc07 Reviewed-by: Jarek Kobus --- src/plugins/projectexplorer/runcontrol.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/plugins/projectexplorer/runcontrol.cpp b/src/plugins/projectexplorer/runcontrol.cpp index 23588f7e099..41ab1af5bb8 100644 --- a/src/plugins/projectexplorer/runcontrol.cpp +++ b/src/plugins/projectexplorer/runcontrol.cpp @@ -1399,7 +1399,7 @@ void SimpleTargetRunnerPrivate::handleStandardError() void SimpleTargetRunnerPrivate::start() { - m_isLocal = m_runnable.device.isNull() || m_runnable.device.dynamicCast(); + m_isLocal = !m_runnable.command.executable().needsDevice(); m_resultData = {}; @@ -1501,8 +1501,7 @@ void SimpleTargetRunnerPrivate::forwardDone() void SimpleTargetRunnerPrivate::forwardStarted() { - const bool isDesktop = m_runnable.device.isNull() - || m_runnable.device.dynamicCast(); + const bool isDesktop = !m_runnable.command.executable().needsDevice(); if (isDesktop) { // Console processes only know their pid after being started ProcessHandle pid{privateApplicationPID()}; @@ -1536,10 +1535,9 @@ void SimpleTargetRunner::start() d->m_runAsRoot = runAsRoot; const QString msg = RunControl::tr("Starting %1...").arg(d->m_runnable.command.toUserOutput()); - appendMessage(msg, Utils::NormalMessageFormat); + appendMessage(msg, NormalMessageFormat); - const bool isDesktop = d->m_runnable.device.isNull() - || d->m_runnable.device.dynamicCast(); + const bool isDesktop = !d->m_runnable.command.executable().needsDevice(); if (isDesktop && d->m_runnable.command.isEmpty()) { reportFailure(RunControl::tr("No executable specified.")); return;