diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-03-07 19:01:34 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-14 19:49:38 +0100 |
| commit | 8977d2fbb4f8e64ed2aa4e7470ca1d3f7f387f7f (patch) | |
| tree | 0d2e83dcf1c5226aa7bf449f18e4cda337c989de /src/tools/qdoc/qmlparser/qqmljsparser_p.h | |
| parent | d3d8ac354665687bd7c96e3f4b3c8b7e0d9c3172 (diff) | |
update qml parser to current version from qtdeclarative
Change-Id: Ic623614aa3c63197e44bf1ae04001997fe7deaac
Reviewed-by: Martin Smith <martin.smith@digia.com>
Diffstat (limited to 'src/tools/qdoc/qmlparser/qqmljsparser_p.h')
| -rw-r--r-- | src/tools/qdoc/qmlparser/qqmljsparser_p.h | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/src/tools/qdoc/qmlparser/qqmljsparser_p.h b/src/tools/qdoc/qmlparser/qqmljsparser_p.h index 9fe7428bc2..1b13690547 100644 --- a/src/tools/qdoc/qmlparser/qqmljsparser_p.h +++ b/src/tools/qdoc/qmlparser/qqmljsparser_p.h @@ -52,8 +52,15 @@ // // -// This file is automatically generated from qmljs.g. -// Changes will be lost. +// W A R N I N G +// ------------- +// +// This file is automatically generated from qqmljs.g. +// Changes should be made to that file, not here. Any change to this file will +// be lost! +// +// To regenerate this file, run: +// qlalr --no-debug --no-lines --qt qqmljs.g // #ifndef QQMLJSPARSER_P_H @@ -64,8 +71,8 @@ #include "qqmljsast_p.h" #include "qqmljsengine_p.h" -#include <qlist.h> -#include <qstring.h> +#include <QtCore/qlist.h> +#include <QtCore/qstring.h> QT_QML_BEGIN_NAMESPACE @@ -75,8 +82,6 @@ class Engine; class QML_PARSER_EXPORT Parser: protected QQmlJSGrammar { - Q_DECLARE_TR_FUNCTIONS(QDoc::QQmlJS::Parser) - public: union Value { int ival; @@ -96,7 +101,8 @@ public: AST::FunctionDeclaration *FunctionDeclaration; AST::Node *Node; AST::PropertyName *PropertyName; - AST::PropertyNameAndValueList *PropertyNameAndValueList; + AST::PropertyAssignment *PropertyAssignment; + AST::PropertyAssignmentList *PropertyAssignmentList; AST::SourceElement *SourceElement; AST::SourceElements *SourceElements; AST::Statement *Statement; @@ -239,9 +245,9 @@ protected: -#define J_SCRIPT_REGEXPLITERAL_RULE1 79 +#define J_SCRIPT_REGEXPLITERAL_RULE1 81 -#define J_SCRIPT_REGEXPLITERAL_RULE2 80 +#define J_SCRIPT_REGEXPLITERAL_RULE2 82 QT_QML_END_NAMESPACE |