diff options
| author | Erik Verbruggen <erik.verbruggen@digia.com> | 2012-12-12 12:24:15 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-17 13:47:25 +0100 |
| commit | ac9aa6bf4b46d39273df12e8b8a1f6c5df3a899d (patch) | |
| tree | 8c2877ba1c0d05e7ace1a429395feae4c4256a49 /src/qml/qml/parser/qqmljslexer.cpp | |
| parent | f685e3463b32bfd05a7b2574b4699e5f42f02f96 (diff) | |
Added parsing for getter/setter definitions in property assignments.
Specified in ecma 5.1, 11.1.5.
Change-Id: I93d12593534ed8a987922c8aa329124940e77c6f
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/parser/qqmljslexer.cpp')
| -rw-r--r-- | src/qml/qml/parser/qqmljslexer.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/qml/qml/parser/qqmljslexer.cpp b/src/qml/qml/parser/qqmljslexer.cpp index c3ddd0a9e8..79fb971dde 100644 --- a/src/qml/qml/parser/qqmljslexer.cpp +++ b/src/qml/qml/parser/qqmljslexer.cpp @@ -42,6 +42,7 @@ #include "qqmljslexer_p.h" #include "qqmljsengine_p.h" #include "qqmljsmemorypool_p.h" +#include "qqmljskeywords_p.h" #include <QtCore/QCoreApplication> #include <QtCore/QVarLengthArray> @@ -1256,5 +1257,3 @@ bool Lexer::scanDirectives(Directives *directives) return true; } - -#include "qqmljskeywords_p.h" |