aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/parser
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2021-10-11 13:59:46 +0200
committerUlf Hermann <ulf.hermann@qt.io>2021-10-13 14:03:41 +0200
commitf2a15482ddd289a36b04316a2b6ebed83eb017c5 (patch)
treeb2588d056ae5a80ac4b726571f6e1e3b0e362f8c /src/qml/parser
parent4e645c7c33b03adf2d9161b00d00267add0aa373 (diff)
Add a Pragma for list assign behavior
[ChangeLog][QtQml] You can now specify the list property assignment behavior in QML using the "ListPropertyAssignBehavior" pragma. This is analogous to the macros you can use in C++. Fixes: QTBUG-93642 Change-Id: I9bdcf198031f1e24891f947b0990a3253d29a998 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/parser')
-rw-r--r--src/qml/parser/qqmljs.g10
-rw-r--r--src/qml/parser/qqmljsast_p.h5
2 files changed, 13 insertions, 2 deletions
diff --git a/src/qml/parser/qqmljs.g b/src/qml/parser/qqmljs.g
index a78dd383f3..7fd2db03a5 100644
--- a/src/qml/parser/qqmljs.g
+++ b/src/qml/parser/qqmljs.g
@@ -824,6 +824,16 @@ UiPragma: T_PRAGMA PragmaId Semicolon;
} break;
./
+UiPragma: T_PRAGMA PragmaId T_COLON JsIdentifier Semicolon;
+/.
+ case $rule_number: {
+ AST::UiPragma *pragma = new (pool) AST::UiPragma(stringRef(2), stringRef(4));
+ pragma->pragmaToken = loc(1);
+ pragma->semicolonToken = loc(5);
+ sym(1).Node = pragma;
+ } break;
+./
+
ImportId: MemberExpression;
UiImport: UiImportHead Semicolon;
diff --git a/src/qml/parser/qqmljsast_p.h b/src/qml/parser/qqmljsast_p.h
index bd4e225412..ba646919dc 100644
--- a/src/qml/parser/qqmljsast_p.h
+++ b/src/qml/parser/qqmljsast_p.h
@@ -3135,8 +3135,8 @@ class QML_PARSER_EXPORT UiPragma: public Node
public:
QQMLJS_DECLARE_AST_NODE(UiPragma)
- UiPragma(QStringView name)
- : name(name)
+ UiPragma(QStringView name, QStringView value = {})
+ : name(name), value(value)
{ kind = K; }
void accept0(BaseVisitor *visitor) override;
@@ -3149,6 +3149,7 @@ public:
// attributes
QStringView name;
+ QStringView value;
SourceLocation pragmaToken;
SourceLocation semicolonToken;
};