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

QmlDesigner.NodeInstances: Fix crash for dot properties

Browse Source 
Change-Id: I5fcecd6fb1e50220053b2769e549f62203f33a06
Reviewed-on: http://codereview.qt.nokia.com/4075
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-09-01 14:31:01 +02:00
parent 485e4dd738
commit ed842542a5
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp
View File

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

4
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.cpp
View File

@@ -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