diff options
| author | Marco Bubke <marco.bubke@nokia.com> | 2011-07-27 14:45:05 +0200 |
|---|---|---|
| committer | Marco Bubke <marco.bubke@nokia.com> | 2011-07-27 15:18:36 +0200 |
| commit | e4286b7dc2ee8440edcabeab8e36f2b86877bf93 (patch) | |
| tree | 22a35c3b8edda4d4df09103fa9f0bf35b3745bcf /share | |
| parent | ef5d054d0c565da963cac0d2935b21a99a7b1729 (diff) | |
QmlDesigner.NodeInstance: Reset items if the aux size is invalid
Change-Id: Ic5c8aa1a622b6e7d446bb1416038571b0b591f54
Reviewed-on: http://codereview.qt.nokia.com/2284
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.cpp index 02afe82c24e..1bf52e049e5 100644 --- a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.cpp +++ b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.cpp @@ -775,7 +775,11 @@ void NodeInstanceServer::setInstanceAuxiliaryData(const PropertyValueContainer & if (auxiliaryContainer.instanceId() == 0 && (auxiliaryContainer.name() == QLatin1String("width") || auxiliaryContainer.name() == QLatin1String("height"))) { - setInstancePropertyVariant(auxiliaryContainer); + if (!auxiliaryContainer.value().isNull()) { + setInstancePropertyVariant(auxiliaryContainer); + } else { + rootNodeInstance().resetProperty(auxiliaryContainer.name()); + } } } |