aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/parser/qqmljslexer.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2018-03-20 22:40:07 +0100
committerLars Knoll <lars.knoll@qt.io>2018-04-26 21:37:48 +0000
commit1b30e8f94cc15352583e8e1f27139676683f62af (patch)
treef149be122d7e31d915f718a65ae7e9fb01f751b5 /src/qml/parser/qqmljslexer.cpp
parent09cd6f8020b7c25eaaf959a48c452b01aebcf627 (diff)
Implement support for the ** and **= operators
Change-Id: I58a21e70fdd040175b52465d6ba52e7fceaf6398 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/parser/qqmljslexer.cpp')
-rw-r--r--src/qml/parser/qqmljslexer.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/qml/parser/qqmljslexer.cpp b/src/qml/parser/qqmljslexer.cpp
index 1165183483..1617f3dfa5 100644
--- a/src/qml/parser/qqmljslexer.cpp
+++ b/src/qml/parser/qqmljslexer.cpp
@@ -661,6 +661,10 @@ again:
return T_STAR_EQ;
} else if (_char == QLatin1Char('*')) {
scanChar();
+ if (_char == QLatin1Char('=')) {
+ scanChar();
+ return T_STAR_STAR_EQ;
+ }
return T_STAR_STAR;
}
return T_STAR;