StartProcessPacket: Get rid of m_processChannelMode

We handle process merging in CallerHandle.

Amends de1bef18e2

Change-Id: I682d600c3ddb0306167389b77cfae8181c1dc9d1
Reviewed-by: hjk <hjk@qt.io>

src/libs/utils/launcherpackets.cpp

@@ -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);
 }
 

src/libs/utils/launcherpackets.h

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

src/libs/utils/launchersocket.cpp

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