From 282e9bf50ac0c9a33338816968edc64a4f528b91 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@nokia.com>
Date: Wed, 29 Jul 2009 06:18:18 +0200
Subject: fix merge error.

---
 src/declarative/fx/qfxitem.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp
index df1aea0..a65b51a 100644
--- a/src/declarative/fx/qfxitem.cpp
+++ b/src/declarative/fx/qfxitem.cpp
@@ -859,7 +859,7 @@ void QFxItem::qmlLoaded()
             QObject* o = c ? c->create(ctxt):0;
             QFxItem* ret = qobject_cast<QFxItem*>(o);
             if (ret) {
-                ret->setItemParent(this);
+                ret->setParentItem(this);
                 QScriptValue v = QmlEnginePrivate::getScriptEngine(qmlEngine(this))->newQObject(ret);
                 emit newChildCreated(d->_qmlnewloading.at(i).toString(),v);
             }
-- 
cgit v0.12