feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

AssetExport: Assign export type component to QML components

Browse Source 
Task-number: QDS-1556
Change-Id: I99c0e0219aa040b74794ab28cf0da7970a81663a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Vikas Pachdha
2020-07-14 11:29:06 +02:00
committed by Tim Jenssen
parent f1d5e56f09
commit f2ea02561e
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmldesigner/assetexporterplugin/assetexportpluginconstants.h
View File

@@ -51,8 +51,11 @@ const char WidthTag[] = "width";
const char HeightTag[] = "height"; const char HeightTag[] = "height";
const char MetadataTag[] = "metadata"; const char MetadataTag[] = "metadata";
const char ChildrenTag[] = "children";
const char QmlIdTag[] = "qmlId"; const char QmlIdTag[] = "qmlId";
const char ExportTypeTag[] = "exportType"; const char ExportTypeTag[] = "exportType";
const char ExportTypeComponent[] = "component";
const char ExportTypeChild[] = "child";
const char QmlPropertiesTag[] = "qmlProperties"; const char QmlPropertiesTag[] = "qmlProperties";
const char ImportsTag[] = "extraImports"; const char ImportsTag[] = "extraImports";
const char UuidTag[] = "uuid"; const char UuidTag[] = "uuid";

7
src/plugins/qmldesigner/assetexporterplugin/componentexporter.cpp
View File

@@ -53,6 +53,7 @@ static void populateLineage(const QmlDesigner::ModelNode &node, QByteArrayList &
} }
namespace QmlDesigner { namespace QmlDesigner {
using namespace Constants;
std::vector<std::unique_ptr<Internal::NodeParserCreatorBase>> Component::m_readers; std::vector<std::unique_ptr<Internal::NodeParserCreatorBase>> Component::m_readers;
Component::Component(AssetExporter &exporter, const ModelNode &rootNode): Component::Component(AssetExporter &exporter, const ModelNode &rootNode):
@@ -76,6 +77,10 @@ void Component::exportComponent()
{ {
QTC_ASSERT(m_rootNode.isValid(), return); QTC_ASSERT(m_rootNode.isValid(), return);
m_json = nodeToJson(m_rootNode); 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(); addImports();
} }
@@ -124,7 +129,7 @@ QJsonObject Component::nodeToJson(const ModelNode &node)
children.append(nodeToJson(childnode)); children.append(nodeToJson(childnode));
if (!children.isEmpty()) if (!children.isEmpty())
jsonObject.insert("children", children); jsonObject.insert(ChildrenTag, children);
return jsonObject; return jsonObject;
} }

2
src/plugins/qmldesigner/assetexporterplugin/parsers/modelitemnodeparser.cpp
View File

@@ -62,7 +62,7 @@ QJsonObject QmlDesigner::ItemNodeParser::json(QmlDesigner::Component &component)
QJsonObject metadata; QJsonObject metadata;
metadata.insert(QmlIdTag, qmlObjectNode.id()); metadata.insert(QmlIdTag, qmlObjectNode.id());
metadata.insert(UuidTag, uuid()); metadata.insert(UuidTag, uuid());
metadata.insert(ExportTypeTag, "child"); metadata.insert(ExportTypeTag, ExportTypeChild);
metadata.insert(TypeNameTag, QString::fromLatin1(m_node.type())); metadata.insert(TypeNameTag, QString::fromLatin1(m_node.type()));
jsonObject.insert(MetadataTag, metadata); jsonObject.insert(MetadataTag, metadata);