From a88e5c1711bbef1af00ca9a9e0db71b8a24223aa Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Tue, 31 Mar 2020 12:04:46 +0200 Subject: TypeDescriptionReader: Read file name from qmltypes Change-Id: Iec295b87da413a2b6c741f3d3313c54caf055fd8 Reviewed-by: Fabian Kosmale --- tools/shared/scopetree.h | 4 ++++ tools/shared/typedescriptionreader.cpp | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/shared/scopetree.h b/tools/shared/scopetree.h index e4e6a59ac2..f28f2fa841 100644 --- a/tools/shared/scopetree.h +++ b/tools/shared/scopetree.h @@ -124,6 +124,9 @@ public: void addEnum(const MetaEnum &fakeEnum) { m_enums.insert(fakeEnum.name(), fakeEnum); } QHash enums() const { return m_enums; } + QString fileName() const { return m_fileName; } + void setFileName(const QString &file) { m_fileName = file; } + QString className() const { return m_className; } void setClassName(const QString &name) { m_className = name; } @@ -198,6 +201,7 @@ private: QVector m_childScopes; ScopeTree *m_parentScope; + QString m_fileName; QString m_name; QString m_className; QString m_superName; diff --git a/tools/shared/typedescriptionreader.cpp b/tools/shared/typedescriptionreader.cpp index cc623b8288..495ee57f32 100644 --- a/tools/shared/typedescriptionreader.cpp +++ b/tools/shared/typedescriptionreader.cpp @@ -208,7 +208,9 @@ void TypeDescriptionReader::readComponent(UiObjectDefinition *ast) "not \"%1\".").arg(name)); } else if (script) { QString name = toString(script->qualifiedId); - if (name == QLatin1String("name")) { + if (name == QLatin1String("file")) { + scope->setFileName(readStringBinding(script)); + } else if (name == QLatin1String("name")) { scope->setClassName(readStringBinding(script)); } else if (name == QLatin1String("prototype")) { scope->setSuperclassName(readStringBinding(script)); -- cgit v1.2.3