From d006d2c64c5f9ee53189c86c88512558dd9bca41 Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Mon, 24 May 2010 11:23:56 +1000
Subject: Component::createObject() don't attempt to set parent of null object
 Don't try to set graphics item parent on an object that is not a
 QGraphicsItem

---
 src/declarative/qml/qdeclarativecomponent.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp
index 3f11425..3b782e7 100644
--- a/src/declarative/qml/qdeclarativecomponent.cpp
+++ b/src/declarative/qml/qdeclarativecomponent.cpp
@@ -576,10 +576,12 @@ QScriptValue QDeclarativeComponent::createObject(QObject* parent)
     bool needParent = (gobj != 0);
     if(parent){
         ret->setParent(parent);
-        QGraphicsObject* gparent = qobject_cast<QGraphicsObject*>(parent);
-        if(gparent){
-            gobj->setParentItem(gparent);
-            needParent = false;
+        if (gobj) {
+            QGraphicsObject* gparent = qobject_cast<QGraphicsObject*>(parent);
+            if(gparent){
+                gobj->setParentItem(gparent);
+                needParent = false;
+            }
         }
     }
     if(needParent)
-- 
cgit v0.12