Merge remote-tracking branch 'origin/6.0'

Change-Id: I642abb110bb120e20af11a5d55244c03e6c48caa

2 files changed, 2 insertions, 1 deletions

diff --git a/src/libs/clangsupport/connectionclient.cpp b/src/libs/clangsupport/connectionclient.cpp
index ff841f33d0..d9addc6ece 100644
--- a/src/libs/clangsupport/connectionclient.cpp
+++ b/src/libs/clangsupport/connectionclient.cpp
@@ -157,6 +157,7 @@ void ConnectionClient::restartProcessIfTimerIsNotResettedAndSocketIsEmpty()
     if (!m_localSocket || m_localSocket->bytesAvailable() > 0)
         return; // We come first, the incoming data was not yet processed.
 
+    disconnectLocalSocketDisconnected();
     disconnectFromServer();
     restartProcessAsynchronously();
 }
diff --git a/src/libs/clangsupport/processcreator.cpp b/src/libs/clangsupport/processcreator.cpp
index 0394aea1f1..9425336e0f 100644
--- a/src/libs/clangsupport/processcreator.cpp
+++ b/src/libs/clangsupport/processcreator.cpp
@@ -70,7 +70,7 @@ std::future<QProcessUniquePointer> ProcessCreator::createProcess() const
 {
     return std::async(std::launch::async, [&] {
         checkIfProcessPathExists();
-        auto process = QProcessUniquePointer(new QtcProcess(ProcessMode::Writer));
+        auto process = QProcessUniquePointer(new QtcProcess());
         process->setProcessChannelMode(QProcess::ForwardedChannels);
         process->setEnvironment(processEnvironment());
         process->setCommand(CommandLine(FilePath::fromString(m_processPath), m_arguments));