Remove deprecated members from graphics view classes

Change-Id: Ia192de674b1085edcf4a88cdeada6df89b442ddd
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>

2 files changed, 4 insertions, 12 deletions

diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.cpp b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.cpp
index f2423cb899..8f5782b0b8 100644
--- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.cpp
+++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.cpp
@@ -252,7 +252,6 @@ void MainView::construct()
 #ifndef QT_NO_OPENGL
     if (m_enableOpenGL) {
         qDebug() << "OpenGL enabled";
-        m_scene->setSortCacheEnabled(false);
         setViewport(new QOpenGLWidget);
 
         // Qt doc says: This is the preferred update mode for
diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/benchmarks/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
index 25fc439883..a9fba18f53 100644
--- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
@@ -423,23 +423,17 @@ static void addChildHelper(QGraphicsItem *parent, int n, bool rotate)
 void tst_QGraphicsView::deepNesting_data()
 {
     QTest::addColumn<bool>("rotate");
-    QTest::addColumn<bool>("sortCache");
     QTest::addColumn<bool>("bsp");
 
-    QTest::newRow("bsp, no transform") << false << false << true;
-    QTest::newRow("bsp, rotation") << true << false << true;
-    QTest::newRow("bsp, no transform, sort cache") << false << true << true;
-    QTest::newRow("bsp, rotation, sort cache") << true << true << true;
-    QTest::newRow("no transform") << false << false << false;
-    QTest::newRow("rotation") << true << false << false;
-    QTest::newRow("no transform, sort cache") << false << true << false;
-    QTest::newRow("rotation, sort cache") << true << true << false;
+    QTest::newRow("bsp, no transform") << false << true;
+    QTest::newRow("bsp, rotation") << true << true;
+    QTest::newRow("no transform") << false << false;
+    QTest::newRow("rotation") << true << false;
 }
 
 void tst_QGraphicsView::deepNesting()
 {
     QFETCH(bool, rotate);
-    QFETCH(bool, sortCache);
     QFETCH(bool, bsp);
 
     QGraphicsScene scene;
@@ -453,7 +447,6 @@ void tst_QGraphicsView::deepNesting()
         }
     }
     scene.setItemIndexMethod(bsp ? QGraphicsScene::BspTreeIndex : QGraphicsScene::NoIndex);
-    scene.setSortCacheEnabled(sortCache);
     scene.setSceneRect(scene.sceneRect());
 
     mView.setRenderHint(QPainter::Antialiasing);