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

StartProcessPacket: Get rid of m_processChannelMode

Browse Source 
We handle process merging in CallerHandle.

Amends de1bef18e2

Change-Id: I682d600c3ddb0306167389b77cfae8181c1dc9d1
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2022-03-31 14:56:09 +02:00
parent b76b8b1542
commit afd70a2c67
3 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

1
src/libs/utils/launcherpackets.h
View File

@@ -113,7 +113,6 @@ public:
QStringList env; QStringList env;
ProcessMode processMode = ProcessMode::Reader; ProcessMode processMode = ProcessMode::Reader;
QByteArray writeData; QByteArray writeData;
QProcess::ProcessChannelMode processChannelMode = QProcess::SeparateChannels;
QString standardInputFile; QString standardInputFile;
bool belowNormalPriority = false; bool belowNormalPriority = false;
QString nativeArguments; QString nativeArguments;

1
src/libs/utils/launchersocket.cpp
View File

@@ -396,7 +396,6 @@ void CallerHandle::start(const QString &program, const QStringList &arguments)
p->workingDir = m_setup->m_workingDirectory.path(); p->workingDir = m_setup->m_workingDirectory.path();
p->processMode = m_setup->m_processMode; p->processMode = m_setup->m_processMode;
p->writeData = m_setup->m_writeData; p->writeData = m_setup->m_writeData;
p->processChannelMode = m_setup->m_processChannelMode;
p->standardInputFile = m_setup->m_standardInputFile; p->standardInputFile = m_setup->m_standardInputFile;
p->belowNormalPriority = m_setup->m_belowNormalPriority; p->belowNormalPriority = m_setup->m_belowNormalPriority;
p->nativeArguments = m_setup->m_nativeArguments; p->nativeArguments = m_setup->m_nativeArguments;