diff options
author | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-06-04 15:26:57 (GMT) |
---|---|---|
committer | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-06-09 07:33:59 (GMT) |
commit | 4f3a8e82fd6b328a06990517648f0d46c50ff41e (patch) | |
tree | 343a1cfbea1a283a0fe8ef4098205930b9ec2742 /src | |
parent | a47b632971068001d56471a9cb78ad983c4a9fee (diff) | |
download | Qt-4f3a8e82fd6b328a06990517648f0d46c50ff41e.zip Qt-4f3a8e82fd6b328a06990517648f0d46c50ff41e.tar.gz Qt-4f3a8e82fd6b328a06990517648f0d46c50ff41e.tar.bz2 |
Ensure we pass the intersect mode when checking item collisions.
This fixes one of two failures in tst_QGraphicsScene::items_QRectF_2.
The other seems unrelated.
Diffstat (limited to 'src')
-rw-r--r-- | src/gui/graphicsview/qgraphicsscene.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index c46ed68..6a79dde 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -1422,7 +1422,7 @@ void QGraphicsScenePrivate::recursive_items_helper(QGraphicsItem *item, QRectF r if (keep && (mode == Qt::ContainsItemShape || mode == Qt::IntersectsItemShape)) { QPainterPath rectPath; rectPath.addRect(rect); - keep = item->collidesWithPath(transform.inverted().map(rectPath)); + keep = item->collidesWithPath(transform.inverted().map(rectPath), mode); } } |