feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJS: Merge new parser from Qt 5.

Browse Source 
Change-Id: I986df52b7ddb31e3bae1148eda881acc1829b102
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
This commit is contained in:
Christian Kamm
2011-12-07 11:16:26 +01:00
parent 72c06cb6fd
commit 67dd062a31
19 changed files with 1469 additions and 1416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/qmljs/parser/qmljsparser_p.h
View File

@@ -108,9 +108,6 @@ public:
AST::UiObjectMemberList *UiObjectMemberList;
AST::UiArrayMemberList *UiArrayMemberList;
AST::UiQualifiedId *UiQualifiedId;
AST::UiSignature *UiSignature;
AST::UiFormalList *UiFormalList;
AST::UiFormal *UiFormal;
};
public:
@@ -231,9 +228,9 @@ protected:
#define J_SCRIPT_REGEXPLITERAL_RULE1 76
#define J_SCRIPT_REGEXPLITERAL_RULE1 79
#define J_SCRIPT_REGEXPLITERAL_RULE2 77
#define J_SCRIPT_REGEXPLITERAL_RULE2 80
QT_QML_END_NAMESPACE