From 5af4f376f88e7859667de6be0eff8f8af304528d Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 28 Sep 2023 17:38:49 +0200 Subject: Loader: Prevent accumulating follow-up errors in failed products For concrete reasons, we continue with dependency resolving even in the presence of errors, but there is no need to run Probes and validate modules after that. Fixes: QBS-1761 Change-Id: Ie280dc3738c835b18ecd5a04ac354eea98260a71 Reviewed-by: Ivan Komissarov --- src/lib/corelib/loader/productresolver.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/lib/corelib/loader/productresolver.cpp b/src/lib/corelib/loader/productresolver.cpp index 694b12c0a..1ba644329 100644 --- a/src/lib/corelib/loader/productresolver.cpp +++ b/src/lib/corelib/loader/productresolver.cpp @@ -222,6 +222,10 @@ void ProductResolverStage1::start() QBS_CHECK(m_product.dependenciesContext); if (!m_product.dependenciesContext->dependenciesResolved) return; + if (m_product.delayedError.hasError() + && m_loaderState.parameters().productErrorMode() == ErrorHandlingMode::Strict) { + return; + } // Run probes for modules and product. resolveProbes(); -- cgit v1.2.3