diff options
| author | Marco Bubke <marco.bubke@nokia.com> | 2010-04-13 15:33:03 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2010-04-14 17:00:55 +0200 |
| commit | 483c8c9928b8d2156e32ba787b9e9baa155f75b6 (patch) | |
| tree | 8cef5862ab1d34df0e524e379d127dc9759f7a77 | |
| parent | 3a0f1fdee3bd7ada9b81445907b68af3819ebaa9 (diff) | |
| download | qt-creator-483c8c9928b8d2156e32ba787b9e9baa155f75b6.tar.gz | |
Return zero for a null object in the graphics node instance
Reviewed-by: kkoehne
(cherry picked from commit c09b515446bc254ca0ef376f0eeb8f036f7ff866)
| -rw-r--r-- | src/plugins/qmldesigner/core/instances/graphicsobjectnodeinstance.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/qmldesigner/core/instances/graphicsobjectnodeinstance.cpp b/src/plugins/qmldesigner/core/instances/graphicsobjectnodeinstance.cpp index db32257797..4fe80a1fcd 100644 --- a/src/plugins/qmldesigner/core/instances/graphicsobjectnodeinstance.cpp +++ b/src/plugins/qmldesigner/core/instances/graphicsobjectnodeinstance.cpp @@ -44,6 +44,9 @@ GraphicsObjectNodeInstance::GraphicsObjectNodeInstance(QGraphicsObject *graphics QGraphicsObject *GraphicsObjectNodeInstance::graphicsObject() const { + if (object() == 0) + return 0; + Q_ASSERT(qobject_cast<QGraphicsObject*>(object())); return static_cast<QGraphicsObject*>(object()); } |