Fix build data rescuing.

The old implementation allowed more than one connection
to a child with the same file path represented by
different artifact objects.

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

1 files changed, 6 insertions, 6 deletions

diff --git a/src/lib/buildgraph/buildgraphloader.cpp b/src/lib/buildgraph/buildgraphloader.cpp
index a75e83b02..46013f512 100644
--- a/src/lib/buildgraph/buildgraphloader.cpp
+++ b/src/lib/buildgraph/buildgraphloader.cpp
@@ -778,12 +778,12 @@ void BuildGraphLoader::rescueOldBuildData(const ResolvedProductConstPtr &restore
         artifact->setTimestamp(oldArtifact->timestamp());
 
         foreach (Artifact * const oldChild, childLists.value(oldArtifact)) {
-            foreach (FileResourceBase *childFileRes,
-                     newlyResolvedProduct->topLevelProject()->buildData->lookupFiles(oldChild)) {
-                Artifact * const child = dynamic_cast<Artifact *>(childFileRes);
-                if (child && !artifact->children.contains(child))
-                    safeConnect(artifact, child, m_logger);
-            }
+            Artifact * const newChild = lookupArtifact(oldChild->product,
+                    newlyResolvedProduct->topLevelProject()->buildData.data(),
+                    oldChild->filePath(), true);
+            if (!newChild || artifact->children.contains(newChild))
+                    continue;
+            safeConnect(artifact, newChild, m_logger);
         }
     }
 }