feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Handle dynamic properties while merging model

Browse Source 
Add variant properties explicitly to handle dynamic properties

Change-Id: I22366e29e390a2dda7d882e4c2fde2540397c955
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Vikas Pachdha
2021-02-24 15:05:17 +01:00
parent c17458cfa9
commit 0c1d44604a
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/qmldesigner/designercore/model/modelmerger.cpp
View File

@@ -62,8 +62,13 @@ static QString fixExpression(const QString &expression, const QHash<QString, QSt
static void syncVariantProperties(ModelNode &outputNode, const ModelNode &inputNode) static void syncVariantProperties(ModelNode &outputNode, const ModelNode &inputNode)
{ {
foreach (const VariantProperty &variantProperty, inputNode.variantProperties()) { foreach (const VariantProperty &property, inputNode.variantProperties()) {
outputNode.variantProperty(variantProperty.name()).setValue(variantProperty.value()); if (property.isDynamic()) {
outputNode.variantProperty(property.name()).
setDynamicTypeNameAndValue(property.dynamicTypeName(), property.value());
continue;
}
outputNode.variantProperty(property.name()).setValue(property.value());
} }
} }
@@ -163,14 +168,10 @@ static ModelNode createNodeFromNode(const ModelNode &modelNode,
const QHash<QString, QString> &idRenamingHash, const QHash<QString, QString> &idRenamingHash,
AbstractView *view, const MergePredicate &mergePredicate) AbstractView *view, const MergePredicate &mergePredicate)
{ {
QList<QPair<PropertyName, QVariant> > propertyList;
QList<QPair<PropertyName, QVariant> > variantPropertyList;
foreach (const VariantProperty &variantProperty, modelNode.variantProperties()) {
propertyList.append(QPair<PropertyName, QVariant>(variantProperty.name(), variantProperty.value()));
}
NodeMetaInfo nodeMetaInfo = view->model()->metaInfo(modelNode.type()); NodeMetaInfo nodeMetaInfo = view->model()->metaInfo(modelNode.type());
ModelNode newNode(view->createModelNode(modelNode.type(), nodeMetaInfo.majorVersion(), nodeMetaInfo.minorVersion(), ModelNode newNode(view->createModelNode(modelNode.type(), nodeMetaInfo.majorVersion(), nodeMetaInfo.minorVersion(),
propertyList, variantPropertyList, modelNode.nodeSource(), modelNode.nodeSourceType())); {}, {}, modelNode.nodeSource(), modelNode.nodeSourceType()));
syncVariantProperties(newNode, modelNode);
syncAuxiliaryProperties(newNode, modelNode); syncAuxiliaryProperties(newNode, modelNode);
syncBindingProperties(newNode, modelNode, idRenamingHash); syncBindingProperties(newNode, modelNode, idRenamingHash);
syncSignalHandlerProperties(newNode, modelNode, idRenamingHash); syncSignalHandlerProperties(newNode, modelNode, idRenamingHash);