From 574e74ffed00158ab0dc251c2789f4dccbf01eae Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Thu, 9 Apr 2020 14:33:31 +0200 Subject: TypeDescriptionReader: Read alias and isFlag for enums Change-Id: I7af2860cf18e7cd97cf3e84065172ce582843536 Reviewed-by: Fabian Kosmale Reviewed-by: Simon Hausmann --- tools/qmllint/metatypes.h | 10 +++++++++- tools/qmllint/typedescriptionreader.cpp | 4 ++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/tools/qmllint/metatypes.h b/tools/qmllint/metatypes.h index d67de2edcd..eb832c27ba 100644 --- a/tools/qmllint/metatypes.h +++ b/tools/qmllint/metatypes.h @@ -44,8 +44,10 @@ class MetaEnum { - QString m_name; QStringList m_keys; + QString m_name; + QString m_alias; + bool m_isFlag = false; public: MetaEnum() = default; @@ -56,6 +58,12 @@ public: QString name() const { return m_name; } void setName(const QString &name) { m_name = name; } + QString alias() const { return m_alias; } + void setAlias(const QString &alias) { m_alias = alias; } + + bool isFlag() const { return m_isFlag; } + void setIsFlag(bool isFlag) { m_isFlag = isFlag; } + void addKey(const QString &key) { m_keys.append(key); } QStringList keys() const { return m_keys; } }; diff --git a/tools/qmllint/typedescriptionreader.cpp b/tools/qmllint/typedescriptionreader.cpp index 3dc87ffc8d..12a1cc01d5 100644 --- a/tools/qmllint/typedescriptionreader.cpp +++ b/tools/qmllint/typedescriptionreader.cpp @@ -398,6 +398,10 @@ void TypeDescriptionReader::readEnum(UiObjectDefinition *ast, const ScopeTree::P QString name = toString(script->qualifiedId); if (name == QLatin1String("name")) { metaEnum.setName(readStringBinding(script)); + } else if (name == QLatin1String("alias")) { + metaEnum.setAlias(readStringBinding(script)); + } else if (name == QLatin1String("isFlag")) { + metaEnum.setIsFlag(readBoolBinding(script)); } else if (name == QLatin1String("values")) { readEnumValues(script, &metaEnum); } else { -- cgit v1.2.3