diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2010-03-30 03:28:43 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2010-03-30 03:41:08 (GMT) |
| commit | 68d3e2da7719ff0fc230e8204946b27018e42c14 (patch) | |
| tree | 63bfb52ada494e3498f53600787dfd5c1f7f9130 /src/declarative/graphicsitems/qdeclarativeloader.cpp | |
| parent | 8368e041e35ab2a79c79f651a56e6ee53a46549f (diff) | |
| download | Qt-68d3e2da7719ff0fc230e8204946b27018e42c14.zip Qt-68d3e2da7719ff0fc230e8204946b27018e42c14.tar.gz Qt-68d3e2da7719ff0fc230e8204946b27018e42c14.tar.bz2 | |
Fix parenting after 6f88388db4e8e202780d789e66664ff824691948.
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeloader.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeloader.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeloader.cpp b/src/declarative/graphicsitems/qdeclarativeloader.cpp index 0d62afa..2f1511e 100644 --- a/src/declarative/graphicsitems/qdeclarativeloader.cpp +++ b/src/declarative/graphicsitems/qdeclarativeloader.cpp @@ -301,12 +301,8 @@ void QDeclarativeLoaderPrivate::_q_sourceLoaded() item = qobject_cast<QGraphicsObject *>(obj); if (item) { QDeclarative_setParent_noEvent(ctxt, obj); - if (QDeclarativeItem* qmlItem = qobject_cast<QDeclarativeItem *>(item)) { - qmlItem->setParentItem(q); - } else { - item->setParentItem(q); - item->setParent(q); - } + QDeclarative_setParent_noEvent(item, q); + item->setParentItem(q); // item->setFocus(true); initResize(); } else { |