diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-08-18 11:25:50 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-08-18 18:03:40 +0000 |
| commit | 4c2ec889328b0a3988e7a7e8f4cae434e647f8cc (patch) | |
| tree | ae9c37e98d7e3dcf4e5b89b8afe3051a708916e9 /src/qml/parser | |
| parent | cf1dcc857a5b9fdc55f21508c812bb4110cf93b7 (diff) | |
Restore yylval initialization
Forward port commit b04b7d340f39dfdde560b1303ea6a8c8ace8056e to do the
initialization in the original file, not in the generated one.
Change-Id: I070d9668c75be20c014835514db49d1a6518d590
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Michael Brasser <michael.brasser@live.com>
Diffstat (limited to 'src/qml/parser')
| -rw-r--r-- | src/qml/parser/qqmljs.g | 1 | ||||
| -rw-r--r-- | src/qml/parser/qqmljsparser.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/parser/qqmljs.g b/src/qml/parser/qqmljs.g index 667bcd1801..d2d947e55c 100644 --- a/src/qml/parser/qqmljs.g +++ b/src/qml/parser/qqmljs.g @@ -451,6 +451,7 @@ Parser::Parser(Engine *engine): location_stack(0), string_stack(0), program(0), + yylval(0), first_token(0), last_token(0) { diff --git a/src/qml/parser/qqmljsparser.cpp b/src/qml/parser/qqmljsparser.cpp index 718ff4d09a..df16a24bcc 100644 --- a/src/qml/parser/qqmljsparser.cpp +++ b/src/qml/parser/qqmljsparser.cpp @@ -92,6 +92,7 @@ Parser::Parser(Engine *engine): location_stack(0), string_stack(0), program(0), + yylval(0), first_token(0), last_token(0) { |