From 4c055491efbb4e49a6b2269ba8ef7ace74865f35 Mon Sep 17 00:00:00 2001
From: Ivan Donchevskii <ivan.donchevskii@qt.io>
Date: Thu, 11 Oct 2018 11:06:23 +0200
Subject: [PATCH] Revert "Clang: Merge channels from clangbackend on Windows"

This reverts commit 179d8dce7341effd3791e80a90f6fe7b37471671.

It causes random crashes caused by different QProcesses so revert
until we find a solution for that.

Change-Id: Id42f996f54aa5926191f02f9b881ba72eb94689e
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
---
 src/libs/clangsupport/processcreator.cpp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/libs/clangsupport/processcreator.cpp b/src/libs/clangsupport/processcreator.cpp
index aa9ba9641a5..22b52793e30 100644
--- a/src/libs/clangsupport/processcreator.cpp
+++ b/src/libs/clangsupport/processcreator.cpp
@@ -36,13 +36,6 @@ namespace ClangBackEnd {
 
 using namespace std::chrono_literals;
 
-static QProcess::ProcessChannelMode kProcessChannelMode
-#ifdef Q_OS_WIN
-    = QProcess::MergedChannels;
-#else
-    = QProcess::ForwardedChannels;
-#endif
-
 ProcessCreator::ProcessCreator()
 {
 }
@@ -73,7 +66,7 @@ std::future<QProcessUniquePointer> ProcessCreator::createProcess() const
     return std::async(std::launch::async, [&] {
         checkIfProcessPathExists();
         auto process = QProcessUniquePointer(new QProcess);
-        process->setProcessChannelMode(kProcessChannelMode);
+        process->setProcessChannelMode(QProcess::QProcess::ForwardedChannels);
         process->setProcessEnvironment(processEnvironment());
         process->start(m_processPath, m_arguments);
         process->waitForStarted(5000);