From ed842542a5ca6a2ff700c70996856210ab666eef Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Thu, 1 Sep 2011 14:31:01 +0200 Subject: [PATCH] QmlDesigner.NodeInstances: Fix crash for dot properties Change-Id: I5fcecd6fb1e50220053b2769e549f62203f33a06 Reviewed-on: http://codereview.qt.nokia.com/4075 Reviewed-by: Qt Sanity Bot Reviewed-by: Thomas Hartmann --- .../qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp | 2 +- .../qml/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.cpp | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp index 8bbe0773be4..88cf0d8cc15 100644 --- a/share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp @@ -573,7 +573,7 @@ QVariant ObjectNodeInstance::property(const QString &name) const QDeclarativeProperty property(object(), name, context()); if (property.property().isEnumType()) { - QVariant value = object()->property(name.toLatin1()); + QVariant value = property.read(); return property.property().enumerator().valueToKey(value.toInt()); } diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.cpp index 8cd232e1581..6a8709b5017 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.cpp @@ -204,8 +204,6 @@ QImage SGItemNodeInstance::renderImage() const QImage renderImage = designerSupport()->renderImageForItem(sgItem(), boundingRect, boundingRect.size().toSize()); - qDebug() << __FUNCTION__ << renderImage.size(); - renderImage = renderImage.convertToFormat(QImage::Format_ARGB32_Premultiplied); return renderImage; @@ -319,8 +317,6 @@ QRectF SGItemNodeInstance::boundingRect() const void SGItemNodeInstance::setPropertyVariant(const QString &name, const QVariant &value) { - if (name == "width" || name == "height") - qDebug() << __FUNCTION__ << name << value; if (name == "state") return; // states are only set by us