diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-07-23 17:27:34 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-07-29 16:30:15 +0200 |
| commit | 759d0a69dd3973b4785b6f9412f46666a05cdf85 (patch) | |
| tree | 987b10a86268b7962f810e2c9955fd73ecfc222b /src/shared/proparser | |
| parent | b4909f5077b4c4255a8c52660cd4c17980708a13 (diff) | |
| download | qt-creator-759d0a69dd3973b4785b6f9412f46666a05cdf85.tar.gz | |
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>
Diffstat (limited to 'src/shared/proparser')
| -rw-r--r-- | src/shared/proparser/qmakeevaluator.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/shared/proparser/qmakeevaluator.cpp b/src/shared/proparser/qmakeevaluator.cpp index 0c35a671dc..a18f661d21 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 |