diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2010-09-28 03:55:04 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2010-09-28 22:43:21 (GMT) |
| commit | 085a121cb1ebba38d62c924500dbc71806b29b3c (patch) | |
| tree | 90702eb46ef0f2c12919860c4492675843c37671 /src/declarative | |
| parent | 2784fe7be27afd80f6da69a683ed7aec91734de8 (diff) | |
| download | Qt-085a121cb1ebba38d62c924500dbc71806b29b3c.zip Qt-085a121cb1ebba38d62c924500dbc71806b29b3c.tar.gz Qt-085a121cb1ebba38d62c924500dbc71806b29b3c.tar.bz2 | |
Fix crash when trying to append a null transform to QDeclarativeItem.
Task-number: QTBUG-13893
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeitem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp index 49b7ad3..7a827d3 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp @@ -1705,7 +1705,7 @@ int QDeclarativeItemPrivate::transform_count(QDeclarativeListProperty<QGraphicsT void QDeclarativeItemPrivate::transform_append(QDeclarativeListProperty<QGraphicsTransform> *list, QGraphicsTransform *item) { QGraphicsObject *object = qobject_cast<QGraphicsObject *>(list->object); - if (object) // QGraphicsItem applies the list in the wrong order, so we prepend. + if (object && item) // QGraphicsItem applies the list in the wrong order, so we prepend. QGraphicsItemPrivate::get(object)->prependGraphicsTransform(item); } |