diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2009-07-29 04:18:18 (GMT) |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2009-07-29 04:18:18 (GMT) |
| commit | 282e9bf50ac0c9a33338816968edc64a4f528b91 (patch) | |
| tree | 574246e226f8daab774aed48ad1014118e9e0c84 /src/declarative | |
| parent | 804bac13d742251f5665dbddc32ff00c4ab86b39 (diff) | |
| download | Qt-282e9bf50ac0c9a33338816968edc64a4f528b91.zip Qt-282e9bf50ac0c9a33338816968edc64a4f528b91.tar.gz Qt-282e9bf50ac0c9a33338816968edc64a4f528b91.tar.bz2 | |
fix merge error.
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/fx/qfxitem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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); } |