forked from qt-creator/qt-creator
StartProcessPacket: Get rid of m_processChannelMode
We handle process merging in CallerHandle.
Amends de1bef18e2
Change-Id: I682d600c3ddb0306167389b77cfae8181c1dc9d1
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -58,18 +58,35 @@ StartProcessPacket::StartProcessPacket(quintptr token)
|
||||
|
||||
void StartProcessPacket::doSerialize(QDataStream &stream) const
|
||||
{
|
||||
stream << command << arguments << workingDir << env << int(processMode) << writeData
|
||||
<< int(processChannelMode) << standardInputFile << belowNormalPriority
|
||||
<< nativeArguments << lowPriority << unixTerminalDisabled << useCtrlCStub;
|
||||
stream << command
|
||||
<< arguments
|
||||
<< workingDir
|
||||
<< env
|
||||
<< int(processMode)
|
||||
<< writeData
|
||||
<< standardInputFile
|
||||
<< belowNormalPriority
|
||||
<< nativeArguments
|
||||
<< lowPriority
|
||||
<< unixTerminalDisabled
|
||||
<< useCtrlCStub;
|
||||
}
|
||||
|
||||
void StartProcessPacket::doDeserialize(QDataStream &stream)
|
||||
{
|
||||
int cm, pm;
|
||||
stream >> command >> arguments >> workingDir >> env >> pm >> writeData >> cm
|
||||
>> standardInputFile >> belowNormalPriority >> nativeArguments >> lowPriority
|
||||
>> unixTerminalDisabled >> useCtrlCStub;
|
||||
processChannelMode = QProcess::ProcessChannelMode(cm);
|
||||
int pm;
|
||||
stream >> command
|
||||
>> arguments
|
||||
>> workingDir
|
||||
>> env
|
||||
>> pm
|
||||
>> writeData
|
||||
>> standardInputFile
|
||||
>> belowNormalPriority
|
||||
>> nativeArguments
|
||||
>> lowPriority
|
||||
>> unixTerminalDisabled
|
||||
>> useCtrlCStub;
|
||||
processMode = Utils::ProcessMode(pm);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user