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

Merge remote-tracking branch 'origin/4.13' into master

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
	src/plugins/cmakeprojectmanager/cmakebuildstep.h
	tests/auto/debugger/tst_namedemangler.cpp
	tests/auto/qml/codemodel/check/tst_check.cpp

Change-Id: Iefd5f71c03c0078513b76a92af764a4fb22ee4c2
This commit is contained in:
Eike Ziller
2020-08-10 14:23:50 +02:00
parent 84e4b3af31 acadee710e
commit 3944162039
205 changed files with 6161 additions and 10173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/libs/qmljs/parser/qmljs.g
View File

@@ -1320,6 +1320,40 @@ UiObjectMember: T_DEFAULT UiObjectMemberPropertyNoInitialiser;
} break;
./
UiObjectMember: T_REQUIRED UiObjectMemberListPropertyNoInitialiser;
/.
case $rule_number: {
AST::UiPublicMember *node = sym(2).UiPublicMember;
node->isRequired = true;
node->requiredToken = loc(1);
sym(1).Node = node;
} break;
./
UiObjectMember: T_DEFAULT T_REQUIRED UiObjectMemberListPropertyNoInitialiser;
/.
case $rule_number: {
AST::UiPublicMember *node = sym(3).UiPublicMember;
node->isRequired = true;
node->requiredToken = loc(2);
node->isDefaultMember = true;
node->defaultToken = loc(1);
sym(1).Node = node;
} break;
./
UiObjectMember: T_REQUIRED T_DEFAULT UiObjectMemberListPropertyNoInitialiser;
/.
case $rule_number: {
AST::UiPublicMember *node = sym(3).UiPublicMember;
node->isRequired = true;
node->requiredToken = loc(1);
node->isDefaultMember = true;
node->defaultToken = loc(2);
sym(1).Node = node;
} break;
./
UiObjectMember: T_DEFAULT UiObjectMemberListPropertyNoInitialiser;
/.
case $rule_number: {

3697
src/libs/qmljs/parser/qmljsgrammar.cpp
View File

File diff suppressed because it is too large Load Diff

12
src/libs/qmljs/parser/qmljsgrammar_p.h
View File

@@ -166,15 +166,15 @@ public:
T_XOR_EQ = 84,
T_YIELD = 100,
ACCEPT_STATE = 1098,
RULE_COUNT = 616,
STATE_COUNT = 1099,
ACCEPT_STATE = 1102,
RULE_COUNT = 619,
STATE_COUNT = 1103,
TERMINAL_COUNT = 134,
NON_TERMINAL_COUNT = 238,
GOTO_INDEX_OFFSET = 1099,
GOTO_INFO_OFFSET = 6942,
GOTO_CHECK_OFFSET = 6942
GOTO_INDEX_OFFSET = 1103,
GOTO_INFO_OFFSET = 6857,
GOTO_CHECK_OFFSET = 6857
};
static const char *const spell[];

1628
src/libs/qmljs/parser/qmljsparser.cpp
View File

File diff suppressed because it is too large Load Diff

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

@@ -1,3 +1,5 @@
#line 185 "qmljs.g"
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
@@ -22,7 +24,6 @@
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
#line 223 "qmljs.g"
//
@@ -291,27 +292,27 @@ protected:
#line 1828 "qmljs.g"
#line 1862 "qmljs.g"
#define J_SCRIPT_REGEXPLITERAL_RULE1 161
#define J_SCRIPT_REGEXPLITERAL_RULE1 164
#line 1840 "qmljs.g"
#line 1874 "qmljs.g"
#define J_SCRIPT_REGEXPLITERAL_RULE2 162
#define J_SCRIPT_REGEXPLITERAL_RULE2 165
#line 3389 "qmljs.g"
#line 3423 "qmljs.g"
#define J_SCRIPT_EXPRESSIONSTATEMENTLOOKAHEAD_RULE 460
#define J_SCRIPT_EXPRESSIONSTATEMENTLOOKAHEAD_RULE 463
#line 4041 "qmljs.g"
#line 4075 "qmljs.g"
#define J_SCRIPT_CONCISEBODYLOOKAHEAD_RULE 530
#define J_SCRIPT_CONCISEBODYLOOKAHEAD_RULE 533
#line 4583 "qmljs.g"
#line 4617 "qmljs.g"
#define J_SCRIPT_EXPORTDECLARATIONLOOKAHEAD_RULE 599
#define J_SCRIPT_EXPORTDECLARATIONLOOKAHEAD_RULE 602
#line 4867 "qmljs.g"
#line 4901 "qmljs.g"
QT_QML_END_NAMESPACE