diff options
| author | Olivier De Cannière <olivier.decanniere@qt.io> | 2025-05-24 11:04:24 +0200 |
|---|---|---|
| committer | Olivier De Cannière <olivier.decanniere@qt.io> | 2025-05-30 18:30:40 +0200 |
| commit | 7cb271bd4fb6587eb4416854632b5dbdf492fd6d (patch) | |
| tree | 55da762317072405c2def1c65695046715209fa7 /src/qml/parser | |
| parent | ee9592f5b48e167cea5230e4bd4718ab2633be22 (diff) | |
AST: Move using declaration to fwd header
QQmlJS::AST::Expression was renamed to QQmlJS::AST::CommaExpression and
a using declaration was introduced to not break outside users of the
AST.
There were still build issues due to the renaming. The using declaration
should probably be in the fwd header to avoid them. Move it there.
Amends 138889eab042fda149e13ed1d2c86d543da003d0
Pick-to: 6.9 6.8
Change-Id: Ia48fc738bf1ed32314871bf7cdcdc913351d136f
Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
Diffstat (limited to 'src/qml/parser')
| -rw-r--r-- | src/qml/parser/qqmljsast_p.h | 2 | ||||
| -rw-r--r-- | src/qml/parser/qqmljsastfwd_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/parser/qqmljsast_p.h b/src/qml/parser/qqmljsast_p.h index 60ae4028e4..50186fe27b 100644 --- a/src/qml/parser/qqmljsast_p.h +++ b/src/qml/parser/qqmljsast_p.h @@ -1678,8 +1678,6 @@ public: ExpressionNode *right; SourceLocation commaToken; }; -// Don't break other users of the parser -using Expression = CommaExpression; class QML_PARSER_EXPORT Block: public Statement { diff --git a/src/qml/parser/qqmljsastfwd_p.h b/src/qml/parser/qqmljsastfwd_p.h index 43179d9f26..df64a9e1d5 100644 --- a/src/qml/parser/qqmljsastfwd_p.h +++ b/src/qml/parser/qqmljsastfwd_p.h @@ -73,6 +73,8 @@ class NotExpression; class BinaryExpression; class ConditionalExpression; class CommaExpression; +// Don't break other users of the parser +using Expression = CommaExpression; class YieldExpression; class Block; class LeftHandSideExpression; |