Fix bug in rescuing build data.

We tried to get information about an artifact's children from the
artifact itself. However, that artifact could have gotten disconnected
along the way and not know anything about its children anymore.
We must therefore save such information in an extra data structure.

Change-Id: Id2043f97e857bf8779184e88b1425fdcf85e3f2e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/src/lib/buildgraph/buildgraphloader.h b/src/lib/buildgraph/buildgraphloader.h
index f13749f26..4806daad3 100644
--- a/src/lib/buildgraph/buildgraphloader.h
+++ b/src/lib/buildgraph/buildgraphloader.h
@@ -31,6 +31,7 @@
 
 #include "forward_decls.h"
 
+#include <buildgraph/artifactlist.h>
 #include <language/forward_decls.h>
 #include <logging/logger.h>
 
@@ -41,7 +42,6 @@ namespace qbs {
 class SetupProjectParameters;
 
 namespace Internal {
-class ArtifactList;
 class FileDependency;
 class FileResourceBase;
 class FileTime;
@@ -97,9 +97,12 @@ private:
                                 const PropertyMapConstPtr &newProperties);
     void replaceFileDependencyWithArtifact(const ResolvedProductPtr &fileDepProduct,
             FileDependency *filedep, Artifact *artifact);
+
+    typedef QHash<const Artifact *, ArtifactList> ChildListHash;
     void rescueOldBuildData(const ResolvedProductConstPtr &restoredProduct,
                             const ResolvedProductPtr &newlyResolvedProduct,
-                            const ProjectBuildData *oldBuildData);
+                            const ProjectBuildData *oldBuildData,
+                            const ChildListHash &childLists);
 
     RulesEvaluationContextPtr m_evalContext;
     BuildGraphLoadResult m_result;