quickvectorimage: fix linked transforms in the item generator

A block that is instantiated more than once registers the same ids
repeatedly, so every instance ended up following the source of the last
one. Once the animation progressed, this surfaced as the wrong parent
transform.

Resolve linked transforms per instantiation.

Task-number: QTBUG-147743
Change-Id: Iff0e914168421a1e5e0a03b60ed32e81fdd4a95e
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>

1 files changed, 17 insertions, 0 deletions

diff --git a/src/quickvectorimage/generator/qquickitemgenerator.cpp b/src/quickvectorimage/generator/qquickitemgenerator.cpp
index 0506f7e3e4..fb34948092 100644
--- a/src/quickvectorimage/generator/qquickitemgenerator.cpp
+++ b/src/quickvectorimage/generator/qquickitemgenerator.cpp
@@ -918,8 +918,25 @@ void QQuickItemGenerator::generateDefsInstantiationNode(const StructureNodeInfo
                 << "generateDefsInstantiationNode: unknown defs id:" << info.defsId;
         return;
     }
+
+    const qsizetype pendingStart = m_pendingLinkedTransforms.size();
+    const QHash<QString, QQuickTransformSource *> outerSources = m_transformSourceItems;
+
     for (const auto &step : *it)
         step();
+
+    QList<PendingLinkedTransform> unresolved;
+    for (qsizetype i = pendingStart; i < m_pendingLinkedTransforms.size(); ++i) {
+        const PendingLinkedTransform &pending = m_pendingLinkedTransforms.at(i);
+        auto source = m_transformSourceItems.constFind(pending.transformReferenceId);
+        if (source == m_transformSourceItems.cend())
+            unresolved.append(pending);
+        else
+            new TransformLinker(source.value(), pending.linkedMatrix, pending.item);
+    }
+    m_pendingLinkedTransforms.resize(pendingStart);
+    m_pendingLinkedTransforms.append(unresolved);
+    m_transformSourceItems = outerSources;
 }
 
 bool QQuickItemGenerator::generateMaskNode(const MaskNodeInfo &info)