1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/library/qmakebuiltins.cpp b/qmake/library/qmakebuiltins.cpp
index aec8d70041..a2ebe1e410 100644
--- a/qmake/library/qmakebuiltins.cpp
+++ b/qmake/library/qmakebuiltins.cpp
@@ -1556,7 +1556,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();