summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativeitem.cpp
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-03-29 06:29:47 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-03-29 06:29:47 (GMT)
commit6f88388db4e8e202780d789e66664ff824691948 (patch)
tree6e701a6b6baa390d4a579e3ac95fb105d12ce91b /src/declarative/graphicsitems/qdeclarativeitem.cpp
parentf3fe89a22b3339fa683bf656950285d1218b1765 (diff)
downloadQt-6f88388db4e8e202780d789e66664ff824691948.zip
Qt-6f88388db4e8e202780d789e66664ff824691948.tar.gz
Qt-6f88388db4e8e202780d789e66664ff824691948.tar.bz2
QDeclarativeItem::setParentItem should not modify the QObject parent
QTBUG-5768
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeitem.cpp')
-rw-r--r--src/declarative/graphicsitems/qdeclarativeitem.cpp4
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);
}