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

RemoteLinux: Propagate FilePath a bit further in KillAppStep

Browse Source 
Change-Id: I566ab0a10dea4ad31909ee10810a982b4a216d67
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
hjk
2022-09-01 08:00:21 +02:00
parent 2006d41680
commit 9434567cdb
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/remotelinux/killappstep.cpp
View File

@@ -25,7 +25,7 @@ class KillAppService : public AbstractRemoteLinuxDeployService
public: public:
~KillAppService() override; ~KillAppService() override;
void setRemoteExecutable(const QString &filePath); void setRemoteExecutable(const FilePath &filePath);
private: private:
void handleStdErr(); void handleStdErr();
@@ -40,7 +40,7 @@ private:
void cleanup(); void cleanup();
void finishDeployment(); void finishDeployment();
QString m_remoteExecutable; FilePath m_remoteExecutable;
DeviceProcessSignalOperation::Ptr m_signalOperation; DeviceProcessSignalOperation::Ptr m_signalOperation;
}; };
@@ -49,7 +49,7 @@ KillAppService::~KillAppService()
cleanup(); cleanup();
} }
void KillAppService::setRemoteExecutable(const QString &filePath) void KillAppService::setRemoteExecutable(const FilePath &filePath)
{ {
m_remoteExecutable = filePath; m_remoteExecutable = filePath;
} }
@@ -68,8 +68,9 @@ void KillAppService::doDeploy()
} }
connect(m_signalOperation.data(), &DeviceProcessSignalOperation::finished, connect(m_signalOperation.data(), &DeviceProcessSignalOperation::finished,
this, &KillAppService::handleSignalOpFinished); this, &KillAppService::handleSignalOpFinished);
emit progressMessage(Tr::tr("Trying to kill \"%1\" on remote device...").arg(m_remoteExecutable)); emit progressMessage(Tr::tr("Trying to kill \"%1\" on remote device...")
m_signalOperation->killProcess(m_remoteExecutable); .arg(m_remoteExecutable.path()));
m_signalOperation->killProcess(m_remoteExecutable.path());
} }
void KillAppService::cleanup() void KillAppService::cleanup()
@@ -113,7 +114,7 @@ public:
Target * const theTarget = target(); Target * const theTarget = target();
QTC_ASSERT(theTarget, return CheckResult::failure()); QTC_ASSERT(theTarget, return CheckResult::failure());
RunConfiguration * const rc = theTarget->activeRunConfiguration(); RunConfiguration * const rc = theTarget->activeRunConfiguration();
const QString remoteExe = rc ? rc->runnable().command.executable().path() : QString(); const FilePath remoteExe = rc ? rc->runnable().command.executable() : FilePath();
service->setRemoteExecutable(remoteExe); service->setRemoteExecutable(remoteExe);
return CheckResult::success(); return CheckResult::success();
}); });