diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2016-11-23 09:47:48 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-11-23 16:33:58 +0000 |
| commit | 7b7fb7fe3ab8ce5db744329b2f138fd8b2a811ea (patch) | |
| tree | afaa3f2bad8a66bd13d9bc2168c0af4017a6441d /src/qml/parser/qqmljsparser_p.h | |
| parent | d274cff81027983de6cac3553bed38e712976210 (diff) | |
Fix support for QML declared default list properties
The grammar was not permitting to write
default property list<Item> myChildren;
and instead developers had to work around it with an alias
property list<Item> myChildrenData;
default property alias myChildren: myChildrenData
which is not nice. Fortunately this is easy to fix in the grammar.
Task-number: QTBUG-10822
Change-Id: I4e914ddb9588913da09e9fb6c6aa154cf8a9e18f
Reviewed-by: Lars Knoll <lars.knoll@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 00ffb6aca3..7533750a53 100644 --- a/src/qml/parser/qqmljsparser_p.h +++ b/src/qml/parser/qqmljsparser_p.h @@ -246,9 +246,9 @@ protected: -#define J_SCRIPT_REGEXPLITERAL_RULE1 88 +#define J_SCRIPT_REGEXPLITERAL_RULE1 90 -#define J_SCRIPT_REGEXPLITERAL_RULE2 89 +#define J_SCRIPT_REGEXPLITERAL_RULE2 91 QT_QML_END_NAMESPACE |