Merge remote-tracking branch 'origin/5.8' into dev

Change-Id: I3b51bb706e401edfda09a433c67aa58e44f33e83

1 files changed, 8 insertions, 5 deletions

diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
index 46d0b18990..76e3b43ce2 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -5050,9 +5050,10 @@ void tst_QGraphicsItem::sceneEventFilter()
     delete ti;
 }
 
-class GeometryChanger : public QGraphicsItem
+class GeometryChanger : public QGraphicsRectItem
 {
 public:
+    explicit GeometryChanger(QRectF r) : QGraphicsRectItem(r) {}
     void changeGeometry()
     { prepareGeometryChange(); }
 };
@@ -5061,10 +5062,12 @@ void tst_QGraphicsItem::prepareGeometryChange()
 {
     {
         QGraphicsScene scene;
-        QGraphicsItem *item = scene.addRect(QRectF(0, 0, 100, 100));
-        QVERIFY(scene.items(QRectF(0, 0, 100, 100)).contains(item));
-        ((GeometryChanger *)item)->changeGeometry();
-        QVERIFY(scene.items(QRectF(0, 0, 100, 100)).contains(item));
+        const QRectF rect(0, 0, 100, 100);
+        GeometryChanger item(rect);
+        scene.addItem(&item);
+        QVERIFY(scene.items(rect).contains(&item));
+        item.changeGeometry();
+        QVERIFY(scene.items(rect).contains(&item));
     }
 }