From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Tue, 23 Jul 2013 15:27:34 +0000 (+0200)
Subject: always check for baseEnv init failure
X-Git-Tag: accepted/tizen/20131212.181521~83^2~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0aa9d5273547cda31462f25480a4a447804901dd;p=platform%2Fupstream%2Fqttools.git

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 <joerg.bornemann@digia.com>
(cherry picked from qtcreator/759d0a69dd3973b4785b6f9412f46666a05cdf85)
---

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