diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2023-10-12 12:31:29 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2023-10-16 08:30:03 +0000 |
| commit | cb0e12ac3a7538aeb865103788429f18fdd84100 (patch) | |
| tree | 9acd886d5bd3c87c6dd27ed5d601cda8305c008a | |
| parent | 53ce9d53d553ed8cd988fec6d32c9198fa929e38 (diff) | |
BuildGraphLoader: Reset expanded build config data
... after updating the top-level profile. Otherwise we will continue with
properties from the wrong profile.
Fixes: QBS-1765
Change-Id: I9723dd38739fac350453417e76b7f2da5e4495c2
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| -rw-r--r-- | src/lib/corelib/buildgraph/buildgraphloader.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/corelib/buildgraph/buildgraphloader.cpp b/src/lib/corelib/buildgraph/buildgraphloader.cpp index eae52864f..c1cf3d403 100644 --- a/src/lib/corelib/buildgraph/buildgraphloader.cpp +++ b/src/lib/corelib/buildgraph/buildgraphloader.cpp @@ -858,8 +858,10 @@ void BuildGraphLoader::replaceFileDependencyWithArtifact(const ResolvedProductPt bool BuildGraphLoader::checkConfigCompatibility() { const TopLevelProjectConstPtr restoredProject = m_result.loadedProject; - if (m_parameters.topLevelProfile().isEmpty()) + if (m_parameters.topLevelProfile().isEmpty()) { m_parameters.setTopLevelProfile(restoredProject->profile()); + m_parameters.expandBuildConfiguration(); + } if (!m_parameters.overrideBuildGraphData()) { if (!m_parameters.overriddenValues().empty() && m_parameters.overriddenValues() != restoredProject->overriddenValues) { |