diff options
author | Lars Knoll <lars.knoll@qt.io> | 2018-03-14 10:04:39 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2018-04-25 17:50:24 +0000 |
commit | d3058682fd3c9994c3a598d901398c1d751e2586 (patch) | |
tree | 6e6050d12b295ff208b2aba291c6fa4950fa5cdf /src/qml/parser/qqmljskeywords_p.h | |
parent | 62143542d40096119c4a3425dd6fa50a4750423c (diff) |
Support static as a keyword in class definitions
This requires some interaction between parser and
lexer as static is only recognized as a keyword
directly in the class declaration.
Change-Id: Ib64157ae6ad542706a5eee8ff4ec7f9cb79a62c3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/parser/qqmljskeywords_p.h')
-rw-r--r-- | src/qml/parser/qqmljskeywords_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/parser/qqmljskeywords_p.h b/src/qml/parser/qqmljskeywords_p.h index e2ae66d796..9cc47469e5 100644 --- a/src/qml/parser/qqmljskeywords_p.h +++ b/src/qml/parser/qqmljskeywords_p.h @@ -503,7 +503,7 @@ static inline int classify6(const QChar *s, int parseModeFlags) { if (s[3].unicode() == 't') { if (s[4].unicode() == 'i') { if (s[5].unicode() == 'c') { - return (parseModeFlags & Lexer::QmlMode) ? int(Lexer::T_STATIC) : int(Lexer::T_IDENTIFIER); + return (parseModeFlags & Lexer::StaticIsKeyword) ? int(Lexer::T_STATIC) : int(Lexer::T_IDENTIFIER); } } } |