diff options
Diffstat (limited to 'src/shared')
-rw-r--r-- | src/shared/proparser/qmakebuiltins.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shared/proparser/qmakebuiltins.cpp b/src/shared/proparser/qmakebuiltins.cpp index 90512b1a5b..0f60a5c4ee 100644 --- a/src/shared/proparser/qmakebuiltins.cpp +++ b/src/shared/proparser/qmakebuiltins.cpp @@ -1544,7 +1544,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional( break; #ifdef PROEVALUATOR_THREAD_SAFE QMutexLocker locker(&baseEnv->mutex); - if (baseEnv->inProgress) { + if (baseEnv->inProgress && baseEnv->evaluator != this) { // The env is still in the works, but it may be already past the cache // loading. So we need to wait for completion and amend it as usual. QThreadPool::globalInstance()->releaseThread(); |