Loader: Merge the remains of ProjectTreeBuilder into ProjectResolver

This will enable us to get rid of redundant data structures and the two-
phase product handling.

Change-Id: I8a9f5e06b216f7b8cd8842acfbcf77edc30fadb4
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/lib/corelib/buildgraph/buildgraphloader.cpp b/src/lib/corelib/buildgraph/buildgraphloader.cpp
index fc05d292c..eae52864f 100644
--- a/src/lib/corelib/buildgraph/buildgraphloader.cpp
+++ b/src/lib/corelib/buildgraph/buildgraphloader.cpp
@@ -338,7 +338,7 @@ void BuildGraphLoader::trackProjectChanges()
     markTransformersForChangeTracking(allRestoredProducts);
     if (!m_parameters.overrideBuildGraphData())
         m_parameters.setEnvironment(restoredProject->environment);
-    ProjectResolver resolver(m_evalContext->engine(), m_logger);
+    ProjectResolver resolver(m_parameters, m_evalContext->engine(), m_logger);
     resolver.setProgressObserver(m_evalContext->observer());
     resolver.setOldProjectProbes(restoredProject->probes);
     if (!m_parameters.forceProbeExecution())
@@ -350,7 +350,7 @@ void BuildGraphLoader::trackProjectChanges()
     resolver.setOldProductProbes(restoredProbes);
     if (!m_parameters.overrideBuildGraphData())
         resolver.setStoredProfiles(restoredProject->profileConfigs);
-    m_result.newlyResolvedProject = resolver.resolve(m_parameters);
+    m_result.newlyResolvedProject = resolver.resolve();
 
     std::vector<ResolvedProductPtr> allNewlyResolvedProducts
             = m_result.newlyResolvedProject->allProducts();