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

ProcessReaper: Implement custom terminate for CtrlCStub case

Browse Source 
Move CtrlCStub-specific interrupt into ProcessHelper.

Amends 7d7e4af3afb5ba9d0ed5210018dd6be67abda469

Change-Id: I5cd9a750c4a89587a874515f752b0144df4b8309
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2022-03-14 17:02:11 +01:00
parent de1bef18e2
commit b76b8b1542
10 changed files with 106 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/utils/launcherpackets.cpp
View File

@@ -60,7 +60,7 @@ void StartProcessPacket::doSerialize(QDataStream &stream) const
{
stream << command << arguments << workingDir << env << int(processMode) << writeData
<< int(processChannelMode) << standardInputFile << belowNormalPriority
<< nativeArguments << lowPriority << unixTerminalDisabled;
<< nativeArguments << lowPriority << unixTerminalDisabled << useCtrlCStub;
}
void StartProcessPacket::doDeserialize(QDataStream &stream)
@@ -68,7 +68,7 @@ void StartProcessPacket::doDeserialize(QDataStream &stream)
int cm, pm;
stream >> command >> arguments >> workingDir >> env >> pm >> writeData >> cm
>> standardInputFile >> belowNormalPriority >> nativeArguments >> lowPriority
>> unixTerminalDisabled;
>> unixTerminalDisabled >> useCtrlCStub;
processChannelMode = QProcess::ProcessChannelMode(cm);
processMode = Utils::ProcessMode(pm);
}