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

QmlDesigner: Support Layout attached properties and expressions

Browse Source 
Change-Id: I4518579364915a91e38c7748857d435a67fd00aa
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Thomas Hartmann
2015-07-08 14:37:53 +02:00
committed by Thomas Hartmann
parent 75de75b346
commit 823f7ff8b9
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
View File

@@ -63,6 +63,11 @@ using namespace QmlJS;
namespace { namespace {
static inline bool isSupportedAttachedProperties(const QString &propertyName)
{
return propertyName.startsWith(QLatin1String("Layout."));
}
static inline QStringList supportedVersionsList() static inline QStringList supportedVersionsList()
{ {
QStringList list; QStringList list;
@@ -1294,7 +1299,8 @@ QmlDesigner::PropertyName TextToModelMerger::syncScriptBinding(ModelNode &modelN
} else { // Not an enum, so: } else { // Not an enum, so:
if (isPropertyChangesType(modelNode.type()) if (isPropertyChangesType(modelNode.type())
|| isConnectionsType(modelNode.type()) || isConnectionsType(modelNode.type())
|| context->lookupProperty(prefix, script->qualifiedId)) { || context->lookupProperty(prefix, script->qualifiedId)
|| isSupportedAttachedProperties(astPropertyName)) {
AbstractProperty modelProperty = modelNode.property(astPropertyName.toUtf8()); AbstractProperty modelProperty = modelNode.property(astPropertyName.toUtf8());
syncExpressionProperty(modelProperty, astValue, TypeName(), differenceHandler); // TODO: parse type syncExpressionProperty(modelProperty, astValue, TypeName(), differenceHandler); // TODO: parse type
return astPropertyName.toUtf8(); return astPropertyName.toUtf8();