aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlirloader.cpp
diff options
context:
space:
mode:
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);