From 823f7ff8b97c8ee52b1763a2186a9cfe320f9c97 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 8 Jul 2015 14:37:53 +0200 Subject: [PATCH] QmlDesigner: Support Layout attached properties and expressions Change-Id: I4518579364915a91e38c7748857d435a67fd00aa Reviewed-by: Tim Jenssen --- .../qmldesigner/designercore/model/texttomodelmerger.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index d6d729dec71..1f02561598a 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -63,6 +63,11 @@ using namespace QmlJS; namespace { +static inline bool isSupportedAttachedProperties(const QString &propertyName) +{ + return propertyName.startsWith(QLatin1String("Layout.")); +} + static inline QStringList supportedVersionsList() { QStringList list; @@ -1294,7 +1299,8 @@ QmlDesigner::PropertyName TextToModelMerger::syncScriptBinding(ModelNode &modelN } else { // Not an enum, so: if (isPropertyChangesType(modelNode.type()) || isConnectionsType(modelNode.type()) - || context->lookupProperty(prefix, script->qualifiedId)) { + || context->lookupProperty(prefix, script->qualifiedId) + || isSupportedAttachedProperties(astPropertyName)) { AbstractProperty modelProperty = modelNode.property(astPropertyName.toUtf8()); syncExpressionProperty(modelProperty, astValue, TypeName(), differenceHandler); // TODO: parse type return astPropertyName.toUtf8();