diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-03-29 06:25:03 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-03-29 06:25:03 (GMT) |
| commit | e993f05e5b927909978e355b0bdea4c1406acafb (patch) | |
| tree | d952d7e2ad32457e34147299485b89c7286593af /src | |
| parent | c3735fe990ca7b18a45d08867e853187fe1d3443 (diff) | |
| parent | 6f88388db4e8e202780d789e66664ff824691948 (diff) | |
| download | Qt-e993f05e5b927909978e355b0bdea4c1406acafb.zip Qt-e993f05e5b927909978e355b0bdea4c1406acafb.tar.gz Qt-e993f05e5b927909978e355b0bdea4c1406acafb.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src')
| -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); } |