diff options
author | Thomas Hartmann <Thomas.Hartmann@nokia.com> | 2010-10-25 13:27:35 +0200 |
---|---|---|
committer | Thomas Hartmann <Thomas.Hartmann@nokia.com> | 2010-10-25 13:31:37 +0200 |
commit | 70fd2c213eaf7e17a20fb6ab1fbd216aaed8c821 (patch) | |
tree | 98f355be10953679c57224a4bc2f49a89dfcc0b9 | |
parent | 742d9008b6e01f52923694533eb582507db6abd4 (diff) | |
download | qt-creator-70fd2c213eaf7e17a20fb6ab1fbd216aaed8c821.tar.gz |
QmlDesigner.NodeInstances: crash fix
This patch avoids a recursion.
Reviewed-by: Marco Bubke
-rw-r--r-- | src/plugins/qmldesigner/designercore/instances/qmlgraphicsitemnodeinstance.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/plugins/qmldesigner/designercore/instances/qmlgraphicsitemnodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/qmlgraphicsitemnodeinstance.cpp index c59359a87d..f126192612 100644 --- a/src/plugins/qmldesigner/designercore/instances/qmlgraphicsitemnodeinstance.cpp +++ b/src/plugins/qmldesigner/designercore/instances/qmlgraphicsitemnodeinstance.cpp @@ -247,16 +247,22 @@ QVariant QmlGraphicsItemNodeInstance::property(const QString &name) const double implicitWidth = qmlGraphicsItem()->implicitWidth(); if (!m_hasWidth && implicitWidth // WORKAROUND - && implicitWidth != qmlGraphicsItem()->width()) - qmlGraphicsItem()->setWidth(implicitWidth); + && implicitWidth != qmlGraphicsItem()->width()) { + qmlGraphicsItem()->blockSignals(true); + qmlGraphicsItem()->setWidth(implicitWidth); + qmlGraphicsItem()->blockSignals(false); + } } if (name == "height" && modelNode().isValid() && !modelNode().hasBindingProperty("height")) { double implicitHeight = qmlGraphicsItem()->implicitHeight(); if (!m_hasHeight && implicitHeight // WORKAROUND - && implicitHeight != qmlGraphicsItem()->height()) - qmlGraphicsItem()->setHeight(implicitHeight); + && implicitHeight != qmlGraphicsItem()->height()) { + qmlGraphicsItem()->blockSignals(true); + qmlGraphicsItem()->setHeight(implicitHeight); + qmlGraphicsItem()->blockSignals(false); + } } return GraphicsObjectNodeInstance::property(name); |