diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-17 01:00:20 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-04-17 10:46:57 +0200 |
| commit | e4707f8ae9dc198abd1460384d1573420f663a84 (patch) | |
| tree | 6cae05ad48f31f13d05237f1af52e9d7dc394eb7 /tools | |
| parent | c3fcbe73189b26e49ad8fa824b2b8e6b7db0a8f4 (diff) | |
| parent | b3eb349ddddec6967fcedfdbfc857b99f34e552a (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/qmltyperegistrar/qmltypesclassdescription.cpp
src/quick/items/qquickrendertarget.h
Change-Id: I9e24d2252a35b8e74af89ad72af796df658167ca
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/shared/metatypes.h | 10 | ||||
| -rw-r--r-- | tools/shared/typedescriptionreader.cpp | 4 |
2 files changed, 13 insertions, 1 deletions
diff --git a/tools/shared/metatypes.h b/tools/shared/metatypes.h index 7594133dde..d271f91d9c 100644 --- a/tools/shared/metatypes.h +++ b/tools/shared/metatypes.h @@ -45,8 +45,10 @@ class MetaEnum { - QString m_name; QStringList m_keys; + QString m_name; + QString m_alias; + bool m_isFlag = false; public: MetaEnum() = default; @@ -57,6 +59,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/shared/typedescriptionreader.cpp b/tools/shared/typedescriptionreader.cpp index 3ca8e7e44a..7831c1ad10 100644 --- a/tools/shared/typedescriptionreader.cpp +++ b/tools/shared/typedescriptionreader.cpp @@ -360,6 +360,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 { |