summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Bubke <marco.bubke@theqtcompany.com>2015-09-21 13:21:55 +0200
committerMarco Bubke <marco.bubke@theqtcompany.com>2015-09-21 13:28:45 +0000
commit87baaee78dc1907b731f76bd5c6943642c6cf625 (patch)
tree7e49dec6d92b836ee376d2b191e12a539e61238a
parenta272d93fcdc537a38abf3e9b5a70d6461b2910c5 (diff)
downloadqt-creator-87baaee78dc1907b731f76bd5c6943642c6cf625.tar.gz
Clang: Add environment variable to disable alive timer
Change-Id: I558ff0fe83cce9ee921819c6fd9c18534fad9bcf Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
-rw-r--r--src/libs/clangbackendipc/connectionclient.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/libs/clangbackendipc/connectionclient.cpp b/src/libs/clangbackendipc/connectionclient.cpp
index 88d2e0b999..da271d080f 100644
--- a/src/libs/clangbackendipc/connectionclient.cpp
+++ b/src/libs/clangbackendipc/connectionclient.cpp
@@ -61,8 +61,12 @@ ConnectionClient::ConnectionClient(IpcClientInterface *client)
{
processAliveTimer.setInterval(10000);
- connect(&processAliveTimer, &QTimer::timeout,
- this, &ConnectionClient::restartProcessIfTimerIsNotResettedAndSocketIsEmpty);
+ const bool startAliveTimer = !qgetenv("QTC_CLANG_NO_ALIVE_TIMER").toInt();
+
+ if (startAliveTimer) {
+ connect(&processAliveTimer, &QTimer::timeout,
+ this, &ConnectionClient::restartProcessIfTimerIsNotResettedAndSocketIsEmpty);
+ }
connect(&localSocket,
static_cast<void (QLocalSocket::*)(QLocalSocket::LocalSocketError)>(&QLocalSocket::error),