diff options
| author | Richard Weickelt <richard@weickelt.de> | 2019-09-23 20:30:04 +0200 |
|---|---|---|
| committer | Richard Weickelt <richard@weickelt.de> | 2019-09-25 15:36:42 +0000 |
| commit | e86375117120f8c7b06afa573d9772d3c783f737 (patch) | |
| tree | 14e71f4e59979dc379889539bc1df0a507336136 /src | |
| parent | 92dcda11cc01927580eb6d9818818bc673206617 (diff) | |
Evaluate probes before Profile items
Profile items can reference project properties, but accessing properties of
project-level probes failed. This patch ensures that probes are executed
before Profile items are evaluated.
Fixes: QBS-1490
Change-Id: I5c215b91ded51ac895e433faa2e6fcfbc3d3e212
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/corelib/language/moduleloader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp index 67d60e05d..9c8f9da1d 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())); } + resolveProbes(&dummyProductContext, projectItem); + projectContext.topLevelProject->probes << dummyProductContext.info.probes; + handleProfileItems(projectItem, &projectContext); QList<Item *> multiplexedProducts; @@ -699,9 +702,6 @@ void ModuleLoader::handleProject(ModuleLoaderResult *loadResult, for (Item * const additionalProductItem : qAsConst(multiplexedProducts)) Item::addChild(projectItem, additionalProductItem); - resolveProbes(&dummyProductContext, projectItem); - projectContext.topLevelProject->probes << dummyProductContext.info.probes; - const QList<Item *> originalChildren = projectItem->children(); for (Item * const child : originalChildren) { switch (child->type()) { |