diff options
author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-26 17:53:45 (GMT) |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-26 17:53:45 (GMT) |
commit | 8f4160b70888218677e976a68e205f4ca8b7d740 (patch) | |
tree | 60d392c1f112b6807ddbfda7ff3a40bb6c5b75bf /src/3rdparty/webkit/JavaScriptCore/generated/Grammar.cpp | |
parent | 9b0c0faf73dbdc382f1c02a42b10018bf9961d72 (diff) | |
parent | 83aa359398a8a510ac732410c918d31eedeeb4f8 (diff) | |
download | Qt-8f4160b70888218677e976a68e205f4ca8b7d740.zip Qt-8f4160b70888218677e976a68e205f4ca8b7d740.tar.gz Qt-8f4160b70888218677e976a68e205f4ca8b7d740.tar.bz2 |
Merge remote branch 'origin/4.6'
Conflicts:
tools/qdoc3/test/qt-build-docs.qdocconf
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/generated/Grammar.cpp')
-rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/generated/Grammar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/generated/Grammar.cpp b/src/3rdparty/webkit/JavaScriptCore/generated/Grammar.cpp index 71451d6..5b1be71 100644 --- a/src/3rdparty/webkit/JavaScriptCore/generated/Grammar.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/generated/Grammar.cpp @@ -236,6 +236,7 @@ #include "JSObject.h" #include "JSString.h" +#include "Lexer.h" #include "NodeConstructors.h" #include "NodeInfo.h" #include <stdlib.h> @@ -257,7 +258,6 @@ #define YYERROR_VERBOSE #endif -int jscyylex(void* lvalp, void* llocp, void* globalPtr); int jscyyerror(const char*); static inline bool allowAutomaticSemicolon(JSC::Lexer&, int); |