1 files changed, 15 insertions, 10 deletions
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp
index 55ee783..b4919ff 100644
--- a/src/declarative/qml/qdeclarativecomponent.cpp
+++ b/src/declarative/qml/qdeclarativecomponent.cpp
@@ -60,7 +60,6 @@
 #include <QFileInfo>
 #include <QtCore/qdebug.h>
 #include <QApplication>
-#include <QGraphicsObject>
 
 QT_BEGIN_NAMESPACE
 
@@ -579,20 +578,26 @@ QScriptValue QDeclarativeComponent::createObject(QObject* parent)
     if (!ret)
         return QScriptValue(QScriptValue::NullValue);
 
-    QGraphicsObject* gobj = qobject_cast<QGraphicsObject*>(ret);
-    bool needParent = (gobj != 0);
-    if(parent){
+
+    if (parent) {
         ret->setParent(parent);
-        if (gobj) {
-            QGraphicsObject* gparent = qobject_cast<QGraphicsObject*>(parent);
-            if(gparent){
-                gobj->setParentItem(gparent);
+        QList<QDeclarativePrivate::AutoParentFunction> functions = QDeclarativeMetaType::parentFunctions();
+
+        bool needParent = false;
+
+        for (int ii = 0; ii < functions.count(); ++ii) {
+            QDeclarativePrivate::AutoParentResult res = functions.at(ii)(ret, parent);
+            if (res == QDeclarativePrivate::Parented) {
                 needParent = false;
+                break;
+            } else if (res == QDeclarativePrivate::IncompatibleParent) {
+                needParent = true;
             }
         }
+
+        if (needParent) 
+            qWarning("QDeclarativeComponent: Created graphical object was not placed in the graphics scene.");
     }
-    if(needParent)
-        qWarning("QDeclarativeComponent: Created graphical object was not placed in the graphics scene.");
 
     QDeclarativeEnginePrivate *priv = QDeclarativeEnginePrivate::get(d->engine);
     QDeclarativeData::get(ret, true)->setImplicitDestructible();