aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2023-09-28 17:38:49 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2023-10-05 08:42:22 +0000
commit5af4f376f88e7859667de6be0eff8f8af304528d (patch)
treef8435b1d521f533e987e5d5ddf02f8b17edc45c7
parentb661c34d89b68504ecfaa98a4a867633a67412e5 (diff)
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 <ABBAPOH@gmail.com>
-rw-r--r--src/lib/corelib/loader/productresolver.cpp4
1 files changed, 4 insertions, 0 deletions
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();