adjust some tests to recent changes

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.cpp
index 22eea75..021c848 100644 (file)
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.cpp
@@ -265,7 +265,6 @@ void MainView::construct()
 #ifndef QT_NO_OPENGL
     if (m_enableOpenGL) {
         qDebug() << "OpenGL enabled";
-        m_scene->setSortCacheEnabled(false);        
         setViewport(new QGLWidget);
 
         // Qt doc says: This is the preferred update mode for

diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
index f2ba8ad..cf72645 100644 (file)
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
@@ -446,7 +446,6 @@ 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;
@@ -462,7 +461,6 @@ void tst_QGraphicsView::deepNesting_data()
 void tst_QGraphicsView::deepNesting()
 {
     QFETCH(bool, rotate);
-    QFETCH(bool, sortCache);
     QFETCH(bool, bsp);
 
     QGraphicsScene scene;
@@ -475,7 +473,6 @@ void tst_QGraphicsView::deepNesting()
         }
     }
     scene.setItemIndexMethod(bsp ? QGraphicsScene::BspTreeIndex : QGraphicsScene::NoIndex);
-    scene.setSortCacheEnabled(sortCache);
     scene.setSceneRect(scene.sceneRect());
 
     mView.setRenderHint(QPainter::Antialiasing);