diff options
| author | Michael Brasser <mbrasser@ford.com> | 2017-04-20 15:59:31 +0200 |
|---|---|---|
| committer | Michael Brasser <michael.brasser@live.com> | 2017-07-13 21:00:55 +0000 |
| commit | 22a2cc43387ec3b9f74a6c01f8665378a4541147 (patch) | |
| tree | 33acf5a5367302eb3f488b688aba7c85959035ae /src/qml/parser/qqmljsparser_p.h | |
| parent | 286f14f1e29e7f4e2db4517d087dd5c92606f971 (diff) | |
Add support for enum declarations in QML
Enums can be declared with the following syntax:
enum MyEnum {
Value1,
Value2
}
Grammar changes done by Simon Hausmann.
[ChangeLog][QtQml] Enums can now be declared directly in QML.
Task-number: QTBUG-14861
Change-Id: Ic6b6e032651d01ee2ecf9d5ce5734976cb3ad7ab
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/parser/qqmljsparser_p.h')
| -rw-r--r-- | src/qml/parser/qqmljsparser_p.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qml/parser/qqmljsparser_p.h b/src/qml/parser/qqmljsparser_p.h index f382cd7563..6273ed48b3 100644 --- a/src/qml/parser/qqmljsparser_p.h +++ b/src/qml/parser/qqmljsparser_p.h @@ -125,6 +125,7 @@ public: AST::UiArrayMemberList *UiArrayMemberList; AST::UiQualifiedId *UiQualifiedId; AST::UiQualifiedPragmaId *UiQualifiedPragmaId; + AST::UiEnumMemberList *UiEnumMemberList; }; public: @@ -246,9 +247,9 @@ protected: -#define J_SCRIPT_REGEXPLITERAL_RULE1 91 +#define J_SCRIPT_REGEXPLITERAL_RULE1 94 -#define J_SCRIPT_REGEXPLITERAL_RULE2 92 +#define J_SCRIPT_REGEXPLITERAL_RULE2 95 QT_QML_END_NAMESPACE |