Do not clear Artifact::product in removeArtifact().v1.3.1

This is too early in the case of change tracking; we still do a couple
of things with the old build data afterwards.

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

2 files changed, 5 insertions, 1 deletions

diff --git a/src/lib/corelib/buildgraph/buildgraphloader.cpp b/src/lib/corelib/buildgraph/buildgraphloader.cpp
index 62749643a..6f1b62212 100644
--- a/src/lib/corelib/buildgraph/buildgraphloader.cpp
+++ b/src/lib/corelib/buildgraph/buildgraphloader.cpp
@@ -336,6 +336,11 @@ void BuildGraphLoader::trackProjectChanges()
     EmptyDirectoriesRemover(m_result.newlyResolvedProject.data(), m_logger)
             .removeEmptyParentDirectories(m_artifactsRemovedFromDisk);
 
+    foreach (FileResourceBase * const f, m_objectsToDelete) {
+        Artifact * const a = dynamic_cast<Artifact *>(f);
+        if (a)
+            a->product.clear(); // To help with the sanity checks.
+    }
     doSanityChecks(m_result.newlyResolvedProject, m_logger);
 }
 
diff --git a/src/lib/corelib/buildgraph/projectbuilddata.cpp b/src/lib/corelib/buildgraph/projectbuilddata.cpp
index c53cb9311..bc0babb9f 100644
--- a/src/lib/corelib/buildgraph/projectbuilddata.cpp
+++ b/src/lib/corelib/buildgraph/projectbuilddata.cpp
@@ -299,7 +299,6 @@ void ProjectBuildData::removeArtifact(Artifact *artifact,
         artifact->product->buildData->nodes.remove(artifact);
         artifact->product->buildData->roots.remove(artifact);
         removeArtifactFromSet(artifact, artifact->product->buildData->artifactsByFileTag);
-        artifact->product.clear();
     }
     isDirty = true;
 }