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

QMLJS: update to qmljsparser from Qt 5.6

Browse Source 
Change-Id: I29a8e07b0b34aa5e8466021cbb71450687f7e11c
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Tim Jenssen
2016-04-29 11:00:30 +02:00
parent 5c45e9ec34
commit c90a356be6
18 changed files with 1503 additions and 1279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,6 +23,7 @@
**
****************************************************************************/
//
// W A R N I N G
// -------------
@@ -230,8 +231,8 @@ protected:
#define J_SCRIPT_REGEXPLITERAL_RULE1 87
#define J_SCRIPT_REGEXPLITERAL_RULE1 88
#define J_SCRIPT_REGEXPLITERAL_RULE2 88
#define J_SCRIPT_REGEXPLITERAL_RULE2 89
QT_QML_END_NAMESPACE