Skip to content

Commit

Permalink
BuildGraphLoader: Reset expanded build config data
Browse files Browse the repository at this point in the history
... 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 <[email protected]>
  • Loading branch information
ckandeler committed Oct 16, 2023
1 parent 53ce9d5 commit cb0e12a
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/lib/corelib/buildgraph/buildgraphloader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit cb0e12a

Please sign in to comment.