Merge 1.12 into master

Change-Id: I0c914674c0728a7f7bc70fd9608914b95ef55a30

1 files changed, 4 insertions, 1 deletions

diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp
index 933c49abc..df47e36ea 100644
--- a/src/lib/corelib/language/moduleloader.cpp
+++ b/src/lib/corelib/language/moduleloader.cpp
@@ -581,6 +581,8 @@ void ModuleLoader::handleTopLevelProject(ModuleLoaderResult *loadResult, Item *p
     for (ProductContext * const p : productSorter.sortedProducts()) {
         try {
             handleProduct(p);
+            if (p->name.startsWith(shadowProductPrefix()))
+                tlp.probes << p->info.probes;
         } catch (const ErrorInfo &err) {
             handleProductError(err, p);
         }
@@ -3418,7 +3420,8 @@ void ModuleLoader::resolveProbe(ProductContext *productContext, Item *parent, It
     const bool condition = m_evaluator->boolValue(probe, StringConstants::conditionProperty());
     const QString &sourceCode = configureScript->sourceCode().toString();
     ProbeConstPtr resolvedProbe;
-    if (parent->type() == ItemType::Project) {
+    if (parent->type() == ItemType::Project
+            || productContext->name.startsWith(shadowProductPrefix())) {
         resolvedProbe = findOldProjectProbe(probeId, condition, initialProperties, sourceCode);
     } else {
         const QString &uniqueProductName = productContext->uniqueName();