Merge remote-tracking branch 'origin/4.8' into master

Change-Id: I6ecd3732a147960681c6135e8752cbd046bad65b

1 files changed, 1 insertions, 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);