Merge remote-tracking branch 'origin/8.0'

Conflicts:
	src/plugins/remotelinux/killappstep.cpp

Change-Id: I4360e7d0f2c2ac258613933de81e8a9c40387379
This commit is contained in:
Eike Ziller
2022-09-02 10:12:40 +02:00
4 changed files with 5 additions and 5 deletions

View File

@@ -113,7 +113,7 @@ public:
Target * const theTarget = target();
QTC_ASSERT(theTarget, return CheckResult::failure());
RunConfiguration * const rc = theTarget->activeRunConfiguration();
const QString remoteExe = rc ? rc->runnable().command.executable().toString() : QString();
const QString remoteExe = rc ? rc->runnable().command.executable().path() : QString();
service->setRemoteExecutable(remoteExe);
return CheckResult::success();
});