diff options
| author | Shane Kearns <shane.kearns@sosco.com> | 2009-10-22 14:26:27 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@sosco.com> | 2009-10-22 14:26:27 (GMT) |
| commit | 5c90ec109b5aa4e20910cfa54b7f05631bc95d71 (patch) | |
| tree | 1d7109cc5a915e1a98c38f416b70cd9f0349ec62 /src/gui/graphicsview/qgraphicsitem.cpp | |
| parent | bff3c3daf29e581cd0b8b990491ff9444c63a3e9 (diff) | |
| parent | dbff78d964d1a034459074f168b505b41bab0c98 (diff) | |
| download | Qt-5c90ec109b5aa4e20910cfa54b7f05631bc95d71.zip Qt-5c90ec109b5aa4e20910cfa54b7f05631bc95d71.tar.gz Qt-5c90ec109b5aa4e20910cfa54b7f05631bc95d71.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/graphicsview/qgraphicsitem.cpp')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 45627f6..4b2ff52 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -1511,6 +1511,8 @@ const QGraphicsObject *QGraphicsItem::toGraphicsObject() const the parent. You should not \l{QGraphicsScene::addItem()}{add} the item to the scene yourself. + Calling this function on an item that is an ancestor of \a parent have undefined behaviour. + \sa parentItem(), childItems() */ void QGraphicsItem::setParentItem(QGraphicsItem *parent) @@ -4735,7 +4737,7 @@ bool QGraphicsItem::isObscuredBy(const QGraphicsItem *item) const { if (!item) return false; - return QGraphicsSceneBspTreeIndexPrivate::closestItemFirst_withoutCache(item, this) + return qt_closestItemFirst(item, this) && qt_QGraphicsItem_isObscured(this, item, boundingRect()); } |