Move expanding of configuration to SetupProjectParameters

This allows Creator to call this explicitly which will then allow to
compare the expanded settings with those used by the project before.

Change-Id: I68aab208c4d1832c502667207054da2bcb8fa84b
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/lib/buildgraph/buildgraph.cpp b/src/lib/buildgraph/buildgraph.cpp
index c9e8c0af4..3b300251d 100644
--- a/src/lib/buildgraph/buildgraph.cpp
+++ b/src/lib/buildgraph/buildgraph.cpp
@@ -483,7 +483,7 @@ BuildGraphLoader::LoadResult BuildGraphLoader::load(const SetupProjectParameters
     m_result = LoadResult();
     m_evalContext = evalContext;
 
-    const QString projectId = TopLevelProject::deriveId(parameters.buildConfiguration());
+    const QString projectId = TopLevelProject::deriveId(parameters.buildConfigurationTree());
     const QString buildDir
             = TopLevelProject::deriveBuildDirectory(parameters.buildRoot(), projectId);
     const QString buildGraphFilePath
@@ -493,7 +493,7 @@ BuildGraphLoader::LoadResult BuildGraphLoader::load(const SetupProjectParameters
     m_logger.qbsDebug() << "[BG] trying to load: " << buildGraphFilePath;
     if (!pool.load(buildGraphFilePath))
         return m_result;
-    if (!isConfigCompatible(parameters.buildConfiguration(), pool.headData().projectConfig)) {
+    if (!isConfigCompatible(parameters.buildConfigurationTree(), pool.headData().projectConfig)) {
         m_logger.qbsDebug() << "[BG] Cannot use stored build graph: "
                                "Incompatible project configuration.";
         return m_result;