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

ProjectExplorer: Replace some uses of Runnable::device

Browse Source 
Change-Id: I76ccbe9a56b9ecdc07fc85885b34f2a31c69fc07
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2022-05-25 13:53:21 +02:00
parent 8badc4669e
commit 2af3b41ad6
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1399,7 +1399,7 @@ void SimpleTargetRunnerPrivate::handleStandardError()
void SimpleTargetRunnerPrivate::start() void SimpleTargetRunnerPrivate::start()
{ {
m_isLocal = m_runnable.device.isNull() || m_runnable.device.dynamicCast<const DesktopDevice>(); m_isLocal = !m_runnable.command.executable().needsDevice();
m_resultData = {}; m_resultData = {};
@@ -1501,8 +1501,7 @@ void SimpleTargetRunnerPrivate::forwardDone()
void SimpleTargetRunnerPrivate::forwardStarted() void SimpleTargetRunnerPrivate::forwardStarted()
{ {
const bool isDesktop = m_runnable.device.isNull() const bool isDesktop = !m_runnable.command.executable().needsDevice();
|| m_runnable.device.dynamicCast<const DesktopDevice>();
if (isDesktop) { if (isDesktop) {
// Console processes only know their pid after being started // Console processes only know their pid after being started
ProcessHandle pid{privateApplicationPID()}; ProcessHandle pid{privateApplicationPID()};
@@ -1536,10 +1535,9 @@ void SimpleTargetRunner::start()
d->m_runAsRoot = runAsRoot; d->m_runAsRoot = runAsRoot;
const QString msg = RunControl::tr("Starting %1...").arg(d->m_runnable.command.toUserOutput()); 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() const bool isDesktop = !d->m_runnable.command.executable().needsDevice();
|| d->m_runnable.device.dynamicCast<const DesktopDevice>();
if (isDesktop && d->m_runnable.command.isEmpty()) { if (isDesktop && d->m_runnable.command.isEmpty()) {
reportFailure(RunControl::tr("No executable specified.")); reportFailure(RunControl::tr("No executable specified."));
return; return;