feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Revert "Clang: Replace macro usage with HostOsInfo"

Browse Source 
This reverts commit cbdf673696.

It introduce a dependency to utils for a couple of lines,
so it is not worth.

Change-Id: I2f53ff3f63322719de6faed7f55c66282d1044e8
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tim Jenssen
2016-11-02 12:19:59 +01:00
parent 49f2d760e3
commit 0e7103ede6
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/clangbackendipc/connectionclient.cpp
View File

@@ -30,8 +30,6 @@
#include "cmbregistertranslationunitsforeditormessage.h" #include "cmbregistertranslationunitsforeditormessage.h"
#include "cmbunregistertranslationunitsforeditormessage.h" #include "cmbunregistertranslationunitsforeditormessage.h"
#include <utils/hostosinfo.h>
#include <QCoreApplication> #include <QCoreApplication>
#include <QMetaMethod> #include <QMetaMethod>
#include <QProcess> #include <QProcess>
@@ -183,10 +181,13 @@ void ConnectionClient::endProcess(QProcess *process)
void ConnectionClient::terminateProcess(QProcess *process) void ConnectionClient::terminateProcess(QProcess *process)
{ {
if (!Utils::HostOsInfo::isWindowsHost() && isProcessIsRunning()) { Q_UNUSED(process)
#ifndef Q_OS_WIN32
if (isProcessIsRunning()) {
process->terminate(); process->terminate();
process->waitForFinished(); process->waitForFinished();
} }
#endif
} }
void ConnectionClient::killProcess(QProcess *process) void ConnectionClient::killProcess(QProcess *process)