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

QmlDesigner.NodeInstance: Reset items if the aux size is invalid

Browse Source 
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>
This commit is contained in:
Marco Bubke
2011-07-27 14:45:05 +02:00
parent ef5d054d0c
commit e4286b7dc2
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.cpp
View File

@@ -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());
}
}
}