diff options
author | Richard Weickelt <richard@weickelt.de> | 2020-02-04 20:35:59 +0100 |
---|---|---|
committer | Richard Weickelt <richard@weickelt.de> | 2020-02-05 11:26:36 +0000 |
commit | bf059105305fd33440940338a7aeb67ec75cb18e (patch) | |
tree | 96bf155ab8898e943b00ad94fa937ab8441258da /src/lib/corelib/language/moduleloader.cpp | |
parent | e67398af5c09fc51f90db4b519805b150db5f3ac (diff) | |
download | qbs-bf059105305fd33440940338a7aeb67ec75cb18e.tar.gz |
Fix probes referencing project properties1.15
This patch fixes a regression introduced in e8637511. Probes in Project items
could no longer reference project properties by writing project.xxx on the
right hand side of a property assignment expression.
Change-Id: I7d04c71f4c493481a00411f12666bd6c2caa8caa
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/lib/corelib/language/moduleloader.cpp')
-rw-r--r-- | src/lib/corelib/language/moduleloader.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp index 9c8f9da1d..9c7f2b3a4 100644 --- a/src/lib/corelib/language/moduleloader.cpp +++ b/src/lib/corelib/language/moduleloader.cpp @@ -688,6 +688,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; @@ -695,7 +698,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); } |