From 483c8c9928b8d2156e32ba787b9e9baa155f75b6 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@nokia.com>
Date: Tue, 13 Apr 2010 15:33:03 +0200
Subject: [PATCH] Return zero for a null object in the graphics node instance

Reviewed-by: kkoehne
(cherry picked from commit c09b515446bc254ca0ef376f0eeb8f036f7ff866)
---
 .../qmldesigner/core/instances/graphicsobjectnodeinstance.cpp  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/plugins/qmldesigner/core/instances/graphicsobjectnodeinstance.cpp b/src/plugins/qmldesigner/core/instances/graphicsobjectnodeinstance.cpp
index db32257797e..4fe80a1fcde 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());
 }