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

Clang: Replace macro usage with HostOsInfo

Browse Source 
Change-Id: Ie2d02785a6f06447a270170d12f580fa1704b7ce
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Orgad Shaneh
2016-09-10 22:56:29 +03:00
committed by Orgad Shaneh
parent d2769f3003
commit cbdf673696
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,6 +30,8 @@
#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>
@@ -180,13 +182,10 @@ void ConnectionClient::endProcess(QProcess *process)
void ConnectionClient::terminateProcess(QProcess *process) void ConnectionClient::terminateProcess(QProcess *process)
{ {
Q_UNUSED(process) if (!Utils::HostOsInfo::isWindowsHost() && isProcessIsRunning()) {
#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)