From 957134dc84ed06d31217fdd79b322d9ed5d096e8 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 23 Jul 2013 17:27:34 +0200 Subject: always check for baseEnv init failure sync up; this doesn't actually do anything in qmake. 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) --- qmake/library/qmakeevaluator.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'qmake/library') diff --git a/qmake/library/qmakeevaluator.cpp b/qmake/library/qmakeevaluator.cpp index 3f6f048730..b898929535 100644 --- a/qmake/library/qmakeevaluator.cpp +++ b/qmake/library/qmakeevaluator.cpp @@ -1355,6 +1355,8 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::visitProFile( return ReturnFalse; } #ifdef PROEVALUATOR_THREAD_SAFE + else if (!baseEnv->isOk) + return ReturnFalse; } #endif -- cgit v1.2.3