diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2010-09-28 03:55:04 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-10-01 04:47:24 (GMT) |
| commit | bb0d20406d5d1b473b9f8d9c1284d310405fcd47 (patch) | |
| tree | b16c6141da44f122a389022a2ae27088b1cddbaf /src/declarative/graphicsitems | |
| parent | 5efa6ff7ca33d2dca14418ac8ffb49b69e2e2452 (diff) | |
| download | Qt-bb0d20406d5d1b473b9f8d9c1284d310405fcd47.zip Qt-bb0d20406d5d1b473b9f8d9c1284d310405fcd47.tar.gz Qt-bb0d20406d5d1b473b9f8d9c1284d310405fcd47.tar.bz2 | |
Fix crash when trying to append a null transform to QDeclarativeItem.
Task-number: QTBUG-13893
(cherry picked from commit 085a121cb1ebba38d62c924500dbc71806b29b3c)
Diffstat (limited to 'src/declarative/graphicsitems')
| -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 e9da4f7..230169d 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); } |