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

ProjectExplorer: Replace one more use of Runnable::device

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

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

@@ -1427,7 +1427,9 @@ void SimpleTargetRunnerPrivate::start()
} else { } else {
QTC_ASSERT(m_state == Inactive, return); QTC_ASSERT(m_state == Inactive, return);
if (!m_runnable.device) { const IDevice::ConstPtr device =
DeviceManager::deviceForPath(m_runnable.command.executable());
if (!device) {
m_resultData.m_errorString = tr("Cannot run: No device."); m_resultData.m_errorString = tr("Cannot run: No device.");
m_resultData.m_error = QProcess::FailedToStart; m_resultData.m_error = QProcess::FailedToStart;
m_resultData.m_exitStatus = QProcess::CrashExit; m_resultData.m_exitStatus = QProcess::CrashExit;
@@ -1435,7 +1437,7 @@ void SimpleTargetRunnerPrivate::start()
return; return;
} }
if (!m_runnable.device->isEmptyCommandAllowed() && m_runnable.command.isEmpty()) { if (!device->isEmptyCommandAllowed() && m_runnable.command.isEmpty()) {
m_resultData.m_errorString = tr("Cannot run: No command given."); m_resultData.m_errorString = tr("Cannot run: No command given.");
m_resultData.m_error = QProcess::FailedToStart; m_resultData.m_error = QProcess::FailedToStart;
m_resultData.m_exitStatus = QProcess::CrashExit; m_resultData.m_exitStatus = QProcess::CrashExit;