From ee3e4f9e25a54a611c8349dc74971244a10fa036 Mon Sep 17 00:00:00 2001 From: Vikas Pachdha Date: Fri, 16 Apr 2021 19:01:07 +0200 Subject: [PATCH] AssetExport: Export custom id Task-number: QDS-4114 Change-Id: I013ff674f0e9f59ed0a82803114faffae28bd74a Reviewed-by: Thomas Hartmann --- .../assetexporterplugin/assetexportpluginconstants.h | 1 + .../assetexporterplugin/dumpers/itemnodedumper.cpp | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexportpluginconstants.h b/src/plugins/qmldesigner/assetexporterplugin/assetexportpluginconstants.h index 07b2fa18338..9a3e0e2b197 100644 --- a/src/plugins/qmldesigner/assetexporterplugin/assetexportpluginconstants.h +++ b/src/plugins/qmldesigner/assetexporterplugin/assetexportpluginconstants.h @@ -54,6 +54,7 @@ const char HeightTag[] = "height"; const char MetadataTag[] = "metadata"; const char ChildrenTag[] = "children"; +const char CustomIdTag[] = "customId"; const char QmlIdTag[] = "qmlId"; const char ExportTypeTag[] = "exportType"; const char ExportTypeComponent[] = "component"; diff --git a/src/plugins/qmldesigner/assetexporterplugin/dumpers/itemnodedumper.cpp b/src/plugins/qmldesigner/assetexporterplugin/dumpers/itemnodedumper.cpp index 71528a4cb25..cc1ecafd689 100644 --- a/src/plugins/qmldesigner/assetexporterplugin/dumpers/itemnodedumper.cpp +++ b/src/plugins/qmldesigner/assetexporterplugin/dumpers/itemnodedumper.cpp @@ -29,6 +29,7 @@ #include "componentexporter.h" #include "qmlitemnode.h" +#include "annotation.h" namespace { static QString capitalize(const QString &str) @@ -85,6 +86,9 @@ QJsonObject QmlDesigner::ItemNodeDumper::json(QmlDesigner::Component &component) metadata.insert(ExportTypeTag, ExportTypeChild); metadata.insert(TypeNameTag, QString::fromLatin1(m_node.type())); + if (m_node.hasCustomId()) + metadata.insert(CustomIdTag, m_node.customId()); + QString typeId = component.exporter().componentUuid(m_node); if (!typeId.isEmpty()) metadata.insert(TypeIdTag, typeId);