diff options
| author | Michael Brasser <mbrasser@ford.com> | 2017-08-17 18:24:39 -0500 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-08-18 18:03:34 +0000 |
| commit | cf1dcc857a5b9fdc55f21508c812bb4110cf93b7 (patch) | |
| tree | 81ad9ad112de838786e2450fe72fc97bf23b9674 /src/qml/parser/qqmljsparser_p.h | |
| parent | ad63e8491bdf6e85af1a72a44ef643321e6ceec0 (diff) | |
Support explicit enum value declaration in QML
Allow declarations such as:
enum MyEnum {
Value1 = 1,
Value2
}
Not all features of C++ enums are supported. Specifically, we don't yet
allow:
* Negative numbers (Value1 = -1)
* Assignment of other values (Value2 = Value1)
Change-Id: I4776f8d86bd0c8688c7dd8b7d4ccb2f72fdfe721
Task-number: QTBUG-14861
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/parser/qqmljsparser_p.h b/src/qml/parser/qqmljsparser_p.h index 6273ed48b3..9dfee70f3a 100644 --- a/src/qml/parser/qqmljsparser_p.h +++ b/src/qml/parser/qqmljsparser_p.h @@ -247,9 +247,9 @@ protected: -#define J_SCRIPT_REGEXPLITERAL_RULE1 94 +#define J_SCRIPT_REGEXPLITERAL_RULE1 96 -#define J_SCRIPT_REGEXPLITERAL_RULE2 95 +#define J_SCRIPT_REGEXPLITERAL_RULE2 97 QT_QML_END_NAMESPACE |