summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@theqtcompany.com>2015-02-03 18:01:52 +0100
committerThomas Hartmann <Thomas.Hartmann@digia.com>2015-02-06 08:58:05 +0000
commite02a9433dddf76837f4bc38361ddb735620d9ba8 (patch)
treed25490dbcd16ab0cf1ae349a1f7332760f5bcec0
parentbc2424c3c651d75c108318ddba487c8f4f948a15 (diff)
downloadqt-creator-e02a9433dddf76837f4bc38361ddb735620d9ba8.tar.gz
QmlDesigner.Puppet: define default values for Layout attached properties
Change-Id: Id81ad808e826813334c6f157331c21fe51dfe69c Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
index 6966f0a00b..2f02043366 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
@@ -1262,6 +1262,11 @@ void ObjectNodeInstance::populateResetHashes()
m_resetValueHash.insert(propertyName, property.read());
}
}
+
+ m_resetValueHash.insert("Layout.rowSpan", 1);
+ m_resetValueHash.insert("Layout.columnSpan", 1);
+ m_resetValueHash.insert("Layout.fillHeight", false);
+ m_resetValueHash.insert("Layout.fillWidth", false);
}
QQmlAbstractBinding *ObjectNodeInstance::resetBinding(const PropertyName &propertyName) const