Remove deprecated QGL* classes

Removes QGL paths in sub-attaq and chip examples.

The boxes example depended on QGL and has been removed.

The corresponding module and test directories for the opengl module are now
empty, but has been left there so we can move the QOpenGL* classes there.

[ChangeLog][QtOpenGL] The deprecated QGL* classes have been removed.

Fixes: QTBUG-74408
Change-Id: I52f56409af8f6901359462a7ba162103d051fe3d
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>

3 files changed, 6 insertions, 23 deletions

diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.cpp b/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.cpp
index dfa08b6869..1eaa5f6578 100644
--- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.cpp
+++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.cpp
@@ -56,13 +56,6 @@ void ChipTester::setAntialias(bool enabled)
     setRenderHint(QPainter::Antialiasing, enabled);
 }
 
-void ChipTester::setOpenGL(bool enabled)
-{
-#ifndef QT_NO_OPENGL
-    setViewport(enabled ? new QGLWidget(QGLFormat(QGL::SampleBuffers)) : 0);
-#endif
-}
-
 void ChipTester::setOperation(Operation operation)
 {
     this->operation = operation;
diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.h b/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.h
index d85686c94e..e4c9197142 100644
--- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.h
+++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.h
@@ -51,7 +51,6 @@ public:
     ChipTester(QWidget *parent = 0);
 
     void setAntialias(bool enabled);
-    void setOpenGL(bool enabled);
     void runBenchmark();
     void setOperation(Operation operation);
 
diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/benchmarks/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
index 9bb5231528..25fc439883 100644
--- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
@@ -382,31 +382,22 @@ void tst_QGraphicsView::mapRectFromScene()
 void tst_QGraphicsView::chipTester_data()
 {
     QTest::addColumn<bool>("antialias");
-    QTest::addColumn<bool>("opengl");
     QTest::addColumn<int>("operation");
-    QTest::newRow("rotate, normal") << false << false << 0;
-    QTest::newRow("rotate, normal, antialias") << true << false << 0;
-    QTest::newRow("rotate, opengl") << false << true << 0;
-    QTest::newRow("rotate, opengl, antialias") << true << true << 0;
-    QTest::newRow("zoom, normal") << false << false << 1;
-    QTest::newRow("zoom, normal, antialias") << true << false << 1;
-    QTest::newRow("zoom, opengl") << false << true << 1;
-    QTest::newRow("zoom, opengl, antialias") << true << true << 1;
-    QTest::newRow("translate, normal") << false << false << 2;
-    QTest::newRow("translate, normal, antialias") << true << false << 2;
-    QTest::newRow("translate, opengl") << false << true << 2;
-    QTest::newRow("translate, opengl, antialias") << true << true << 2;
+    QTest::newRow("rotate") << false << 0;
+    QTest::newRow("rotate, antialias") << true << 0;
+    QTest::newRow("zoom") << false << 1;
+    QTest::newRow("zoom, antialias") << true << 1;
+    QTest::newRow("translate") << false << 2;
+    QTest::newRow("translate, antialias") << true << 2;
 }
 
 void tst_QGraphicsView::chipTester()
 {
     QFETCH(bool, antialias);
-    QFETCH(bool, opengl);
     QFETCH(int, operation);
 
     ChipTester tester;
     tester.setAntialias(antialias);
-    tester.setOpenGL(opengl);
     tester.setOperation(ChipTester::Operation(operation));
     tester.show();
     QVERIFY(QTest::qWaitForWindowExposed(&tester));