diff options
| -rw-r--r-- | src/qml/parser/qqmljs.g | 2 | ||||
| -rw-r--r-- | tests/auto/qml/ecmascripttests/TestExpectations | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/qml/parser/qqmljs.g b/src/qml/parser/qqmljs.g index ad19fbe0d9..405513b435 100644 --- a/src/qml/parser/qqmljs.g +++ b/src/qml/parser/qqmljs.g @@ -2469,7 +2469,7 @@ LogicalORExpression_In: LogicalORExpression_In T_OR_OR LogicalANDExpression_In; ConditionalExpression: LogicalORExpression; ConditionalExpression_In: LogicalORExpression_In; -ConditionalExpression: LogicalORExpression T_QUESTION AssignmentExpression T_COLON AssignmentExpression; +ConditionalExpression: LogicalORExpression T_QUESTION AssignmentExpression_In T_COLON AssignmentExpression; /. case $rule_number: Q_FALLTHROUGH(); ./ ConditionalExpression_In: LogicalORExpression_In T_QUESTION AssignmentExpression_In T_COLON AssignmentExpression_In; /. diff --git a/tests/auto/qml/ecmascripttests/TestExpectations b/tests/auto/qml/ecmascripttests/TestExpectations index f5dbf20864..e3bb93ab7f 100644 --- a/tests/auto/qml/ecmascripttests/TestExpectations +++ b/tests/auto/qml/ecmascripttests/TestExpectations @@ -3962,7 +3962,6 @@ language/expressions/compound-assignment/S11.13.2_A7.6_T4.js fails language/expressions/compound-assignment/S11.13.2_A7.7_T4.js fails language/expressions/compound-assignment/S11.13.2_A7.8_T4.js fails language/expressions/compound-assignment/S11.13.2_A7.9_T4.js fails -language/expressions/conditional/in-branch-1.js fails language/expressions/conditional/tco-cond.js strictFails language/expressions/conditional/tco-pos.js strictFails language/expressions/delete/11.4.1-5-a-28-s.js strictFails |