AssetExport: Assign export type component to QML components

Task-number: QDS-1556
Change-Id: I99c0e0219aa040b74794ab28cf0da7970a81663a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>

3 files changed, 10 insertions, 2 deletions

diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexportpluginconstants.h b/src/plugins/qmldesigner/assetexporterplugin/assetexportpluginconstants.h
index 8702435527..063a4a6e8c 100644
--- a/src/plugins/qmldesigner/assetexporterplugin/assetexportpluginconstants.h
+++ b/src/plugins/qmldesigner/assetexporterplugin/assetexportpluginconstants.h
@@ -51,8 +51,11 @@ const char WidthTag[] = "width";
 const char HeightTag[] = "height";
 
 const char MetadataTag[] = "metadata";
+const char ChildrenTag[] = "children";
 const char QmlIdTag[] = "qmlId";
 const char ExportTypeTag[] = "exportType";
+const char ExportTypeComponent[] = "component";
+const char ExportTypeChild[] = "child";
 const char QmlPropertiesTag[] = "qmlProperties";
 const char ImportsTag[] = "extraImports";
 const char UuidTag[] = "uuid";
diff --git a/src/plugins/qmldesigner/assetexporterplugin/componentexporter.cpp b/src/plugins/qmldesigner/assetexporterplugin/componentexporter.cpp
index 059b6ecb16..973cb6e013 100644
--- a/src/plugins/qmldesigner/assetexporterplugin/componentexporter.cpp
+++ b/src/plugins/qmldesigner/assetexporterplugin/componentexporter.cpp
@@ -53,6 +53,7 @@ static void populateLineage(const QmlDesigner::ModelNode &node, QByteArrayList &
 }
 
 namespace QmlDesigner {
+using namespace Constants;
 
 std::vector<std::unique_ptr<Internal::NodeParserCreatorBase>> Component::m_readers;
 Component::Component(AssetExporter &exporter, const ModelNode &rootNode):
@@ -76,6 +77,10 @@ void Component::exportComponent()
 {
     QTC_ASSERT(m_rootNode.isValid(), return);
     m_json = nodeToJson(m_rootNode);
+    // Change the export type to component
+    QJsonObject metadata = m_json.value(MetadataTag).toObject();
+    metadata.insert(ExportTypeTag, ExportTypeComponent);
+    m_json.insert(MetadataTag, metadata);
     addImports();
 }
 
@@ -124,7 +129,7 @@ QJsonObject Component::nodeToJson(const ModelNode &node)
         children.append(nodeToJson(childnode));
 
     if (!children.isEmpty())
-        jsonObject.insert("children", children);
+        jsonObject.insert(ChildrenTag, children);
 
     return jsonObject;
 }
diff --git a/src/plugins/qmldesigner/assetexporterplugin/parsers/modelitemnodeparser.cpp b/src/plugins/qmldesigner/assetexporterplugin/parsers/modelitemnodeparser.cpp
index 5a236a366c..c8439c9ac1 100644
--- a/src/plugins/qmldesigner/assetexporterplugin/parsers/modelitemnodeparser.cpp
+++ b/src/plugins/qmldesigner/assetexporterplugin/parsers/modelitemnodeparser.cpp
@@ -62,7 +62,7 @@ QJsonObject QmlDesigner::ItemNodeParser::json(QmlDesigner::Component &component)
     QJsonObject metadata;
     metadata.insert(QmlIdTag, qmlObjectNode.id());
     metadata.insert(UuidTag, uuid());
-    metadata.insert(ExportTypeTag, "child");
+    metadata.insert(ExportTypeTag, ExportTypeChild);
     metadata.insert(TypeNameTag, QString::fromLatin1(m_node.type()));
 
     jsonObject.insert(MetadataTag, metadata);