More work on getting autotests to pass.

1 files changed, 5 insertions, 18 deletions

diff --git a/src/gui/graphicsview/qgraphicssceneindex.cpp b/src/gui/graphicsview/qgraphicssceneindex.cpp
index 8d7581f..4eaed2b 100644
--- a/src/gui/graphicsview/qgraphicssceneindex.cpp
+++ b/src/gui/graphicsview/qgraphicssceneindex.cpp
@@ -56,6 +56,7 @@
     \sa QGraphicsScene, QGraphicsView
 */
 
+#include "qdebug.h"
 #include "qgraphicsscene.h"
 #include "qgraphicsitem_p.h"
 #include "qgraphicsscene_p.h"
@@ -131,14 +132,10 @@ public:
                 keep = QGraphicsSceneIndexPrivate::itemCollidesWithPath(item, pointPath, mode);
             }
         } else {
-            QRectF sceneBrect = transform.mapRect(brect);
-            keep = sceneBrect.contains(scenePoint);
-            if (keep && (mode == Qt::ContainsItemShape || mode == Qt::IntersectsItemShape)) {
-                QPainterPath pointPath;
-                pointPath.addRect(QRectF(transform.inverted().map(scenePoint), QSizeF(1, 1)));
-                keep = QGraphicsSceneIndexPrivate::itemCollidesWithPath(item, pointPath, mode);
-            }
+            QRectF sceneBoundingRect = transform.mapRect(brect);
+            keep = sceneBoundingRect.intersects(QRectF(scenePoint, QSizeF(1, 1))) && item->contains(transform.inverted().map(scenePoint));
         }
+
         return keep;
     }
 
@@ -366,15 +363,6 @@ QGraphicsScene* QGraphicsSceneIndex::scene() const
 }
 
 /*!
-    Returns the indexed area for the index
-*/
-QRectF QGraphicsSceneIndex::indexedRect() const
-{
-    Q_D(const QGraphicsSceneIndex);
-    return d->scene->d_func()->sceneRect;
-}
-
-/*!
     \fn QList<QGraphicsItem *> QGraphicsSceneIndex::items(const QPointF &pos,
     Qt::ItemSelectionMode mode, Qt::SortOrder order, const QTransform
     &deviceTransform) const
@@ -613,9 +601,8 @@ void QGraphicsSceneIndex::prepareBoundingRectChange(const QGraphicsItem *item)
     rectangle. \a rect is the new value of the scene rectangle.
     \sa QGraphicsScene::sceneRect()
 */
-void QGraphicsSceneIndex::sceneRectChanged(const QRectF &rect)
+void QGraphicsSceneIndex::sceneRectChanged()
 {
-    Q_UNUSED(rect);
 }
 
 QT_END_NAMESPACE