QmlDesigner: Extend captured data

Change-Id: I780815e6f42be4f3aceb1d784a685cc330572832
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>

1 files changed, 10 insertions, 8 deletions

diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5capturenodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5capturenodeinstanceserver.cpp
index aea75a76c7f..f1e2a3a4758 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5capturenodeinstanceserver.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5capturenodeinstanceserver.cpp
@@ -56,17 +56,19 @@ CapturedDataCommand::StateData collectStateData(ServerNodeInstance rootNodeInsta
     stateData.image = ImageContainer(stateInstanceId,
                                      QmlDesigner::renderPreviewImage(rootNodeInstance),
                                      stateInstanceId);
+    stateData.nodeId = stateInstanceId;
 
     for (const ServerNodeInstance &instance : nodeInstances) {
+        CapturedDataCommand::NodeData nodeData;
+
+        nodeData.nodeId = instance.instanceId();
+        nodeData.contentRect = instance.contentItemBoundingRect();
+        nodeData.sceneTransform = instance.sceneTransform();
         auto textProperty = instance.property("text");
-        if (!textProperty.isNull() && instance.holdsGraphical()) {
-            CapturedDataCommand::NodeData nodeData;
-            nodeData.nodeId = instance.instanceId();
-            nodeData.contentRect = instance.contentItemBoundingRect();
-            nodeData.sceneTransform = instance.sceneTransform();
-            nodeData.text = textProperty.toString();
-            stateData.nodeData.push_back(std::move(nodeData));
-        }
+        if (!textProperty.isNull() && instance.holdsGraphical())
+            nodeData.properties.emplace_back(QString{"text"}, textProperty.toString());
+
+        stateData.nodeData.push_back(std::move(nodeData));
     }
 
     return stateData;