Improve handling of changes to restored build graph.

Instead of painstakingly inserting new product pointers into an existing
build graph, do it the other way around and put existing build data into
the newly resolved project. This is much more robust.

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

1 files changed, 2 insertions, 3 deletions

diff --git a/src/lib/buildgraph/artifact.h b/src/lib/buildgraph/artifact.h
index 88d9b677f..bc2a8025d 100644
--- a/src/lib/buildgraph/artifact.h
+++ b/src/lib/buildgraph/artifact.h
@@ -59,7 +59,7 @@ public:
     // include language.h in every file that includes artifact.h due to Qt 4's weird
     // QSharedPointer implementation.
     Artifact();
-    explicit Artifact(const ResolvedProjectPtr &project);
+    explicit Artifact(TopLevelProject *project);
 
     ~Artifact();
 
@@ -67,7 +67,7 @@ public:
     ArtifactList children;
     ArtifactList fileDependencies;
     FileTags fileTags;
-    WeakPointer<ResolvedProject> project;
+    TopLevelProject *topLevelProject;
     WeakPointer<ResolvedProduct> product;          // Note: file dependency artifacts don't belong to a product.
     TransformerPtr transformer;
     PropertyMapPtr properties;
@@ -102,7 +102,6 @@ public:
     QString dirPath() const { return m_dirPath.toString(); }
     QString fileName() const { return m_fileName.toString(); }
     void disconnectAll(const Logger &logger);
-    TopLevelProject *topLevelProject() const;
 
 private:
     void load(PersistentPool &pool);