Merge branch '1.15' into master

Change-Id: I7e348db380b836221db79c73ea3b5f1d891f114b

1 files changed, 3 insertions, 1 deletions

diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp
index 55b671022..07276bbdc 100644
--- a/src/lib/corelib/language/moduleloader.cpp
+++ b/src/lib/corelib/language/moduleloader.cpp
@@ -706,6 +706,9 @@ void ModuleLoader::handleProject(ModuleLoaderResult *loadResult,
                                                               m_qbsVersion.toString()));
     }
 
+    for (Item * const child : projectItem->children())
+        child->setScope(projectContext.scope);
+
     resolveProbes(&dummyProductContext, projectItem);
     projectContext.topLevelProject->probes << dummyProductContext.info.probes;
 
@@ -713,7 +716,6 @@ void ModuleLoader::handleProject(ModuleLoaderResult *loadResult,
 
     QList<Item *> multiplexedProducts;
     for (Item * const child : projectItem->children()) {
-        child->setScope(projectContext.scope);
         if (child->type() == ItemType::Product)
             multiplexedProducts << multiplexProductItem(&dummyProductContext, child);
     }