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>

diff --git a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.cpp
index 02afe82..1bf52e0 100644 (file)
--- 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());
+        }
     }
 }