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 <[email protected]>
dougcooper · Dec 11, 2019 · f08038f · f08038f
1 parent bef74b6
commit f08038f
Show file tree

Hide file tree

Showing 107 changed files with 16 additions and 33,376 deletions.
diff --git a/examples/widgets/animation/sub-attaq/mainwindow.cpp b/examples/widgets/animation/sub-attaq/mainwindow.cpp
@@ -59,10 +59,6 @@
 #include <QMenuBar>
 #include <QLayout>
 
-#ifndef QT_NO_OPENGL
-# include <QtOpenGL>
-#endif
-
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
 {
@@ -84,14 +80,5 @@ MainWindow::MainWindow(QWidget *parent)
     view = new QGraphicsView(scene, this);
     view->setAlignment(Qt::AlignLeft | Qt::AlignTop);
     scene->setupScene(newAction, quitAction);
-#ifndef QT_NO_OPENGL
-    QGLWidget *glWidget = new QGLWidget(QGLFormat(QGL::SampleBuffers));
-    if (glWidget->context()->isValid()) {
-        view->setViewport(glWidget);
-    } else {
-        qWarning("Unable to create an Open GL context with sample buffers, not using Open GL.");
-        delete glWidget;
-    }
-#endif
     setCentralWidget(view);
 }
diff --git a/examples/widgets/animation/sub-attaq/sub-attaq.pro b/examples/widgets/animation/sub-attaq/sub-attaq.pro
@@ -1,5 +1,4 @@
 QT += widgets
-qtHaveModule(opengl): QT += opengl
 HEADERS += boat.h \
     bomb.h \
     mainwindow.h \

diff --git a/examples/widgets/graphicsview/boxes/3rdparty/fbm.c b/examples/widgets/graphicsview/boxes/3rdparty/fbm.c
diff --git a/examples/widgets/graphicsview/boxes/3rdparty/fbm.h b/examples/widgets/graphicsview/boxes/3rdparty/fbm.h
diff --git a/examples/widgets/graphicsview/boxes/basic.fsh b/examples/widgets/graphicsview/boxes/basic.fsh