diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-03-29 06:51:54 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-03-29 06:51:54 (GMT) |
| commit | bf2f5fbd01b49dad9a2bdfd20d1ccba03936bf88 (patch) | |
| tree | 4849d88509b994c65fbb1737a778c09f5cce0cd3 /src/declarative/graphicsitems/qdeclarativeitem.cpp | |
| parent | 49d56ab243a5f490495a79ce98276e2f33c03658 (diff) | |
| parent | e993f05e5b927909978e355b0bdea4c1406acafb (diff) | |
| download | Qt-bf2f5fbd01b49dad9a2bdfd20d1ccba03936bf88.zip Qt-bf2f5fbd01b49dad9a2bdfd20d1ccba03936bf88.tar.gz Qt-bf2f5fbd01b49dad9a2bdfd20d1ccba03936bf88.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeitem.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeitem.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp index 611535c..e8f3652 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp @@ -1438,10 +1438,6 @@ QDeclarativeItem::~QDeclarativeItem() */ void QDeclarativeItem::setParentItem(QDeclarativeItem *parent) { - QDeclarativeItem *oldParent = parentItem(); - if (parent == oldParent || !parent) return; - - QObject::setParent(parent); QGraphicsObject::setParentItem(parent); } |