diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-07-23 17:27:34 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-27 13:36:28 +0200 |
| commit | 957134dc84ed06d31217fdd79b322d9ed5d096e8 (patch) | |
| tree | 4cf8178e492d496a5ba4877280b962c9e6be1913 /qmake/library | |
| parent | 507f1889e2b21d0b3367715dc5e63e124433a992 (diff) | |
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 <joerg.bornemann@digia.com>
(cherry picked from qtcreator/759d0a69dd3973b4785b6f9412f46666a05cdf85)
Diffstat (limited to 'qmake/library')
| -rw-r--r-- | qmake/library/qmakeevaluator.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
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 |