From 28de5ec4fd2ad6ee3edd875840515164c7c7bf0c Mon Sep 17 00:00:00 2001 From: Vikas Pachdha Date: Thu, 25 Mar 2021 17:21:57 +0100 Subject: [PATCH] AssetExporter: Export type Label as text Task-number: QDS-3979 Change-Id: I0920d242a480da9a27f26d39b44ab1d3714917e4 Reviewed-by: Thomas Hartmann --- .../assetexporterplugin/dumpers/textnodedumper.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/assetexporterplugin/dumpers/textnodedumper.cpp b/src/plugins/qmldesigner/assetexporterplugin/dumpers/textnodedumper.cpp index 49d16cb393b..d9e9ace498f 100644 --- a/src/plugins/qmldesigner/assetexporterplugin/dumpers/textnodedumper.cpp +++ b/src/plugins/qmldesigner/assetexporterplugin/dumpers/textnodedumper.cpp @@ -34,6 +34,8 @@ #include +#include + namespace { const QHash AlignMapping{ {"AlignRight", "RIGHT"}, @@ -63,7 +65,10 @@ TextNodeDumper::TextNodeDumper(const QByteArrayList &lineage, const ModelNode &n bool TextNodeDumper::isExportable() const { - return lineage().contains("QtQuick.Text"); + const QByteArrayList &baseClasses = lineage(); + return std::any_of(baseClasses.cbegin(), baseClasses.cend(), [](const QByteArray &type) { + return type == "QtQuick.Text" || type == "QtQuick.Controls.Label"; + }); } QJsonObject TextNodeDumper::json(Component &component) const