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

Merge remote-tracking branch 'origin/8.0'

Browse Source 
Conflicts:
	src/plugins/remotelinux/killappstep.cpp

Change-Id: I4360e7d0f2c2ac258613933de81e8a9c40387379
This commit is contained in:
Eike Ziller
2022-09-02 10:12:40 +02:00
parent b7398f7e0e e4bc08fb21
commit 9c708b79ce
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -1353,7 +1353,7 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id)
if (info.buildDirectory.isEmpty()) { if (info.buildDirectory.isEmpty()) {
setBuildDirectory(shadowBuildDirectory(target->project()->projectFilePath(), setBuildDirectory(shadowBuildDirectory(target->project()->projectFilePath(),
k, k,
info.displayName, info.typeName,
info.buildType)); info.buildType));
} }

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

@@ -113,7 +113,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().toString() : QString(); const QString remoteExe = rc ? rc->runnable().command.executable().path() : QString();
service->setRemoteExecutable(remoteExe); service->setRemoteExecutable(remoteExe);
return CheckResult::success(); return CheckResult::success();
}); });

4
src/plugins/remotelinux/linuxdevice.cpp
View File

@@ -492,9 +492,9 @@ void LinuxProcessInterface::sendControlSignal(ControlSignal controlSignal)
QTC_ASSERT(controlSignal != ControlSignal::KickOff, return); QTC_ASSERT(controlSignal != ControlSignal::KickOff, return);
const qint64 pid = processId(); const qint64 pid = processId();
QTC_ASSERT(pid, return); // TODO: try sending a signal based on process name QTC_ASSERT(pid, return); // TODO: try sending a signal based on process name
const QString args = QString::fromLatin1("-%1 %2") const QString args = QString::fromLatin1("-%1 -%2")
.arg(controlSignalToInt(controlSignal)).arg(pid); .arg(controlSignalToInt(controlSignal)).arg(pid);
CommandLine command = { "kill", args, CommandLine::Raw }; const CommandLine command = { "kill", args, CommandLine::Raw };
// Note: This blocking call takes up to 2 ms for local remote. // Note: This blocking call takes up to 2 ms for local remote.
runInShell(command); runInShell(command);
} }

2
src/plugins/remotelinux/remotelinuxsignaloperation.cpp
View File

@@ -24,7 +24,7 @@ RemoteLinuxSignalOperation::~RemoteLinuxSignalOperation() = default;
static QString signalProcessGroupByPidCommandLine(qint64 pid, int signal) static QString signalProcessGroupByPidCommandLine(qint64 pid, int signal)
{ {
return QString::fromLatin1("kill -%1 %2").arg(signal).arg(pid); return QString::fromLatin1("kill -%1 -%2").arg(signal).arg(pid);
} }
void RemoteLinuxSignalOperation::run(const QString &command) void RemoteLinuxSignalOperation::run(const QString &command)