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

MSVC: Increase timeout for environment detection

Browse Source 
Surprisingly many users apparently do run into the timeout.

Task-number: QTCREATORBUG-17474
Change-Id: I756a5164d52feee1e45bfebacbd45cc232628b79
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2016-12-21 10:48:18 +01:00
parent 3ffec118d0
commit 81b255e960
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/projectexplorer/abstractmsvctoolchain.cpp
View File

@@ -287,7 +287,7 @@ bool AbstractMsvcToolChain::generateEnvironmentSettings(Utils::Environment &env,
// if Creator is launched within a session set up by setenv.cmd. // if Creator is launched within a session set up by setenv.cmd.
env.unset(QLatin1String("ORIGINALPATH")); env.unset(QLatin1String("ORIGINALPATH"));
run.setEnvironment(env.toStringList()); run.setEnvironment(env.toStringList());
run.setTimeoutS(10); run.setTimeoutS(30);
Utils::FileName cmdPath = Utils::FileName::fromUserInput(QString::fromLocal8Bit(qgetenv("COMSPEC"))); Utils::FileName cmdPath = Utils::FileName::fromUserInput(QString::fromLocal8Bit(qgetenv("COMSPEC")));
if (cmdPath.isEmpty()) if (cmdPath.isEmpty())
cmdPath = env.searchInPath(QLatin1String("cmd.exe")); cmdPath = env.searchInPath(QLatin1String("cmd.exe"));