diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-08-11 00:09:19 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-08-11 00:09:19 (GMT) |
| commit | c170e75cd3af746cfec80ff7d5feb44228a329c3 (patch) | |
| tree | a869e64b45ec871dd0a55b0994a14616656dcc86 /src/declarative | |
| parent | 4026b2c7bc91f8f25f73b182687d5d2bed823217 (diff) | |
| parent | 5a438bd30cf7d92309cbff51da523b7faea335f5 (diff) | |
| download | Qt-c170e75cd3af746cfec80ff7d5feb44228a329c3.zip Qt-c170e75cd3af746cfec80ff7d5feb44228a329c3.tar.gz Qt-c170e75cd3af746cfec80ff7d5feb44228a329c3.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeitem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp index ff05997..9d782b9 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp @@ -2724,12 +2724,12 @@ QVariant QDeclarativeItem::itemChange(GraphicsItemChange change, } break; case ItemChildAddedChange: - if (d->_contents) + if (d->_contents && d->componentComplete) d->_contents->childAdded(qobject_cast<QDeclarativeItem*>( value.value<QGraphicsItem*>())); break; case ItemChildRemovedChange: - if (d->_contents) + if (d->_contents && d->componentComplete) d->_contents->childRemoved(qobject_cast<QDeclarativeItem*>( value.value<QGraphicsItem*>())); break; |