From 0e7103ede612c349abcbfd1b721570b1c6049294 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Wed, 2 Nov 2016 12:19:59 +0100 Subject: [PATCH] Revert "Clang: Replace macro usage with HostOsInfo" This reverts commit cbdf673696119d53f2d2bb0821aa758b8b36878c. It introduce a dependency to utils for a couple of lines, so it is not worth. Change-Id: I2f53ff3f63322719de6faed7f55c66282d1044e8 Reviewed-by: Marco Bubke Reviewed-by: Orgad Shaneh --- src/libs/clangbackendipc/connectionclient.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/libs/clangbackendipc/connectionclient.cpp b/src/libs/clangbackendipc/connectionclient.cpp index 0ccd742fb6c..ecd2f0b2332 100644 --- a/src/libs/clangbackendipc/connectionclient.cpp +++ b/src/libs/clangbackendipc/connectionclient.cpp @@ -30,8 +30,6 @@ #include "cmbregistertranslationunitsforeditormessage.h" #include "cmbunregistertranslationunitsforeditormessage.h" -#include - #include #include #include @@ -183,10 +181,13 @@ void ConnectionClient::endProcess(QProcess *process) void ConnectionClient::terminateProcess(QProcess *process) { - if (!Utils::HostOsInfo::isWindowsHost() && isProcessIsRunning()) { + Q_UNUSED(process) +#ifndef Q_OS_WIN32 + if (isProcessIsRunning()) { process->terminate(); process->waitForFinished(); } +#endif } void ConnectionClient::killProcess(QProcess *process)