aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlirloader.cpp
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/qml/qqmlirloader.cpp
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/qml/qqmlirloader.cpp')
-rw-r--r--src/qml/qml/qqmlirloader.cpp14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlirloader.cpp b/src/qml/qml/qqmlirloader.cpp
index 8b700cd928..6b8be0bb74 100644
--- a/src/qml/qml/qqmlirloader.cpp
+++ b/src/qml/qml/qqmlirloader.cpp
@@ -58,18 +58,24 @@ void QQmlIRLoader::load()
for (quint32 i = 0; i < qmlUnit->nImports; ++i)
output->imports << qmlUnit->importAt(i);
- const auto createPragma = [&](QmlIR::Pragma::PragmaType type) {
+ const auto createPragma = [&](
+ QmlIR::Pragma::PragmaType type,
+ QmlIR::Pragma::ListPropertyAssignBehaviorValue value = QmlIR::Pragma::Append) {
QmlIR::Pragma *p = New<QmlIR::Pragma>();
p->location = QV4::CompiledData::Location();
p->type = type;
+ p->listPropertyAssignBehavior = value;
output->pragmas << p;
};
if (unit->flags & QV4::CompiledData::Unit::IsSingleton)
- createPragma(QmlIR::Pragma::PragmaSingleton);
+ createPragma(QmlIR::Pragma::Singleton);
if (unit->flags & QV4::CompiledData::Unit::IsStrict)
- createPragma(QmlIR::Pragma::PragmaStrict);
-
+ createPragma(QmlIR::Pragma::Strict);
+ if (unit->flags & QV4::CompiledData::Unit::ListPropertyAssignReplace)
+ createPragma(QmlIR::Pragma::ListPropertyAssignBehavior, QmlIR::Pragma::Replace);
+ else if (unit->flags & QV4::CompiledData::Unit::ListPropertyAssignReplaceIfNotDefault)
+ createPragma(QmlIR::Pragma::ListPropertyAssignBehavior, QmlIR::Pragma::ReplaceIfNotDefault);
for (uint i = 0; i < qmlUnit->nObjects; ++i) {
const QV4::CompiledData::Object *serializedObject = qmlUnit->objectAt(i);