From 33f1eb50e24785d365f60119b5f9292ae94b9d20 Mon Sep 17 00:00:00 2001
From: Volker Hilsheimer <volker.hilsheimer@qt.io>
Date: Wed, 9 Oct 2019 13:35:58 +0200
Subject: Fix build of the sub-attaq example
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

QMenuBar is only forward declared in QMainWindow. I don't think this is
a recent change or breakage, just noticed then when running a complete
build of the 5.15 branch.

Change-Id: Ia1a072044bd26c5f3f51ec5f5b0f72f065a0576f
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
---
 examples/widgets/animation/sub-attaq/mainwindow.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'examples/widgets/animation')

diff --git a/examples/widgets/animation/sub-attaq/mainwindow.cpp b/examples/widgets/animation/sub-attaq/mainwindow.cpp
index 8f545ecebd..f9617a22eb 100644
--- a/examples/widgets/animation/sub-attaq/mainwindow.cpp
+++ b/examples/widgets/animation/sub-attaq/mainwindow.cpp
@@ -56,6 +56,7 @@
 #include <QGraphicsView>
 #include <QApplication>
 #include <QMenu>
+#include <QMenuBar>
 #include <QLayout>
 
 #ifndef QT_NO_OPENGL
-- 
cgit v1.2.3


From f08038fca79b0828da11fbf35f4165d6efa4de2f Mon Sep 17 00:00:00 2001
From: Johan Klokkhammer Helsing <johan.helsing@qt.io>
Date: Fri, 29 Nov 2019 11:49:28 +0100
Subject: 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>
---
 examples/widgets/animation/sub-attaq/mainwindow.cpp | 13 -------------
 examples/widgets/animation/sub-attaq/sub-attaq.pro  |  1 -
 2 files changed, 14 deletions(-)

(limited to 'examples/widgets/animation')

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 \
-- 
cgit v1.2.3