From 0aa9d5273547cda31462f25480a4a447804901dd Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 23 Jul 2013 17:27:34 +0200 Subject: [PATCH] always check for baseEnv init failure sync up; doesn't do anything in lupdate. creator's file watcher can trigger many parallel, entirely non-hierarchical project reloads. if there is enough of them to exceed the thread pool size, some will be serialized already by qtconcurrent, not by our wait condition. these should notice a faulty spec, too. Change-Id: I8ce40cb90fbc28045127881d57ec94e125df79af Reviewed-by: Joerg Bornemann (cherry picked from qtcreator/759d0a69dd3973b4785b6f9412f46666a05cdf85) --- src/linguist/shared/qmakeevaluator.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/linguist/shared/qmakeevaluator.cpp b/src/linguist/shared/qmakeevaluator.cpp index 4024e12..67aeb11 100644 --- a/src/linguist/shared/qmakeevaluator.cpp +++ b/src/linguist/shared/qmakeevaluator.cpp @@ -1357,6 +1357,8 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::visitProFile( return ReturnFalse; } #ifdef PROEVALUATOR_THREAD_SAFE + else if (!baseEnv->isOk) + return ReturnFalse; } #endif -- 2.7.4