diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-11-29 11:49:28 +0100 |
|---|---|---|
| committer | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-12-11 11:53:15 +0100 |
| commit | f08038fca79b0828da11fbf35f4165d6efa4de2f (patch) | |
| tree | c10331ef7c2f79f968a45b4dcb25609b594f27cf /examples/widgets/animation/sub-attaq | |
| parent | bef74b6c3a0a9c8649ea8eb333d80015f76863e4 (diff) | |
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>
Diffstat (limited to 'examples/widgets/animation/sub-attaq')
| -rw-r--r-- | examples/widgets/animation/sub-attaq/mainwindow.cpp | 13 | ||||
| -rw-r--r-- | examples/widgets/animation/sub-attaq/sub-attaq.pro | 1 |
2 files changed, 0 insertions, 14 deletions
diff --git a/examples/widgets/animation/sub-attaq/mainwindow.cpp b/examples/widgets/animation/sub-attaq/mainwindow.cpp index f9617a22eb..0c152c9180 100644 --- 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 index ac79fd4249..ea44253fa1 100644 --- 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 \ |