From 759d0a69dd3973b4785b6f9412f46666a05cdf85 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Tue, 23 Jul 2013 17:27:34 +0200
Subject: [PATCH] always check for baseEnv init failure

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>
---
 src/shared/proparser/qmakeevaluator.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/shared/proparser/qmakeevaluator.cpp b/src/shared/proparser/qmakeevaluator.cpp
index 0c35a671dca..a18f661d21c 100644
--- a/src/shared/proparser/qmakeevaluator.cpp
+++ b/src/shared/proparser/qmakeevaluator.cpp
@@ -1340,6 +1340,8 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::visitProFile(
                     return ReturnFalse;
             }
 #ifdef PROEVALUATOR_THREAD_SAFE
+            else if (!baseEnv->isOk)
+                return ReturnFalse;
         }
 #endif