Update dependencies

qtbase: Adapt to OpenGL split (a64f4b405222527a72fb087226801c52ddf54ef0),
add missing Q_MOC_INCLUDE, adapt examples to changed signals.

Task-number: QTBUG-74273
Change-Id: I96b7bb67c0403e3aa72debe16fd9965c70f5c806
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

36 files changed, 77 insertions, 47 deletions

diff --git a/dependencies.yaml b/dependencies.yaml
index 6c6fc64a..951be41e 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -1,10 +1,10 @@
 dependencies:
   ../qtbase:
-    ref: 8652c79df0a47264a2d525424484e15744e2462b
+    ref: e0b89899e3c505edbdece60d6a2d2368a7ef9a01
     required: true
   ../qtdeclarative:
-    ref: d5dc3c4cbdc4455143626d7a3e0f9a9a211515a9
+    ref: eb5aa8d9c18535ecd0aacc42fe3af954faf01c04
     required: false
   ../qtmultimedia:
-    ref: cfcff5f42656409056ba19b87e3fee31505128c6
+    ref: e2c2b21e530276c216cddf641cf9c0f8098b16ce
     required: false
diff --git a/examples/charts/candlestickchart/main.cpp b/examples/charts/candlestickchart/main.cpp
index 243b0f61..26a26a37 100644
--- a/examples/charts/candlestickchart/main.cpp
+++ b/examples/charts/candlestickchart/main.cpp
@@ -32,6 +32,7 @@
 #include <QtCharts/QChartView>
 #include <QtCharts/QValueAxis>
 #include <QtCore/QDateTime>
+#include <QtCore/QFile>
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QMainWindow>
 
diff --git a/examples/charts/piechartcustomization/brushtool.cpp b/examples/charts/piechartcustomization/brushtool.cpp
index d4c1785b..a33674a6 100644
--- a/examples/charts/piechartcustomization/brushtool.cpp
+++ b/examples/charts/piechartcustomization/brushtool.cpp
@@ -62,7 +62,7 @@ BrushTool::BrushTool(QString title, QWidget *parent)
     setLayout(layout);
 
     connect(m_colorButton, &QPushButton::clicked, this, &BrushTool::showColorDialog);
-    connect(m_styleCombo, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    connect(m_styleCombo, &QComboBox::currentIndexChanged,
             this, &BrushTool::updateStyle);
 }
 
diff --git a/examples/charts/piechartcustomization/mainwidget.cpp b/examples/charts/piechartcustomization/mainwidget.cpp
index 7c3648a2..4a7a1243 100644
--- a/examples/charts/piechartcustomization/mainwidget.cpp
+++ b/examples/charts/piechartcustomization/mainwidget.cpp
@@ -89,7 +89,7 @@ MainWidget::MainWidget(QWidget *parent)
     QGroupBox *chartSettings = new QGroupBox("Chart");
     chartSettings->setLayout(chartSettingsLayout);
 
-    connect(m_themeComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    connect(m_themeComboBox, &QComboBox::currentIndexChanged,
             this, &MainWidget::updateChartSettings);
     connect(m_aaCheckBox, &QCheckBox::toggled, this, &MainWidget::updateChartSettings);
     connect(m_animationsCheckBox, &QCheckBox::toggled, this, &MainWidget::updateChartSettings);
@@ -223,15 +223,12 @@ MainWidget::MainWidget(QWidget *parent)
     connect(m_labelBrushTool, &BrushTool::changed, this, &MainWidget::updateSliceSettings);
     connect(m_sliceLabelVisible, &QCheckBox::toggled, this, &MainWidget::updateSliceSettings);
     connect(m_sliceLabelVisible, &QCheckBox::toggled, this, &MainWidget::updateSliceSettings);
-    connect(m_sliceLabelArmFactor,
-            static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged),
+    connect(m_sliceLabelArmFactor, &QDoubleSpinBox::valueChanged,
             this, &MainWidget::updateSliceSettings);
     connect(m_sliceExploded, &QCheckBox::toggled, this, &MainWidget::updateSliceSettings);
-    connect(m_sliceExplodedFactor,
-            static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged),
+    connect(m_sliceExplodedFactor, &QDoubleSpinBox::valueChanged,
             this, &MainWidget::updateSliceSettings);
-    connect(m_labelPosition,
-            static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    connect(m_labelPosition, &QComboBox::currentIndexChanged,
             this, &MainWidget::updateSliceSettings);
 
     // create chart view
diff --git a/examples/charts/piechartcustomization/pentool.cpp b/examples/charts/piechartcustomization/pentool.cpp
index 3b160859..36e970d3 100644
--- a/examples/charts/piechartcustomization/pentool.cpp
+++ b/examples/charts/piechartcustomization/pentool.cpp
@@ -73,17 +73,13 @@ PenTool::PenTool(QString title, QWidget *parent)
 
     // Use old style connect on some signals because the signal is overloaded
     connect(m_colorButton, &QPushButton::clicked, this, &PenTool::showColorDialog);
-    connect(m_widthSpinBox,
-            static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged),
+    connect(m_widthSpinBox, &QDoubleSpinBox::valueChanged,
             this, &PenTool::updateWidth);
-    connect(m_styleCombo,
-            static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    connect(m_styleCombo, &QComboBox::currentIndexChanged,
             this, &PenTool::updateStyle);
-    connect(m_capStyleCombo,
-            static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    connect(m_capStyleCombo, &QComboBox::currentIndexChanged,
             this, &PenTool::updateCapStyle);
-    connect(m_joinStyleCombo,
-            static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    connect(m_joinStyleCombo, &QComboBox::currentIndexChanged,
             this, &PenTool::updateJoinStyle);
 }
 
diff --git a/src/charts/areachart/qareaseries.h b/src/charts/areachart/qareaseries.h
index 41b09ba5..ba775f7e 100644
--- a/src/charts/areachart/qareaseries.h
+++ b/src/charts/areachart/qareaseries.h
@@ -35,6 +35,8 @@
 #include <QtGui/QPen>
 #include <QtGui/QBrush>
 
+Q_MOC_INCLUDE(<QtCharts/qlineseries.h>)
+
 QT_CHARTS_BEGIN_NAMESPACE
 class QLineSeries;
 class QAreaSeriesPrivate;
diff --git a/src/charts/barchart/qbarmodelmapper.h b/src/charts/barchart/qbarmodelmapper.h
index 3aa77d92..7041943b 100644
--- a/src/charts/barchart/qbarmodelmapper.h
+++ b/src/charts/barchart/qbarmodelmapper.h
@@ -33,6 +33,9 @@
 #include <QtCharts/QChartGlobal>
 #include <QtCore/QObject>
 
+Q_MOC_INCLUDE(<QtCharts/qabstractbarseries.h>)
+Q_MOC_INCLUDE(<QtCharts/qvbarmodelmapper.h>)
+
 QT_BEGIN_NAMESPACE
 class QAbstractItemModel;
 QT_END_NAMESPACE
diff --git a/src/charts/barchart/qhbarmodelmapper.h b/src/charts/barchart/qhbarmodelmapper.h
index 05abb3c7..a4be46c7 100644
--- a/src/charts/barchart/qhbarmodelmapper.h
+++ b/src/charts/barchart/qhbarmodelmapper.h
@@ -32,6 +32,9 @@
 
 #include <QtCharts/QBarModelMapper>
 
+Q_MOC_INCLUDE(<QtCharts/qpieseries.h>)
+Q_MOC_INCLUDE(<QtCore/qabstractitemmodel.h>)
+
 QT_CHARTS_BEGIN_NAMESPACE
 /* Comment line for syncqt to generate the fwd-include correctly, due to QTBUG-22432 */
 class Q_CHARTS_EXPORT QHBarModelMapper : public QBarModelMapper
diff --git a/src/charts/barchart/qvbarmodelmapper.h b/src/charts/barchart/qvbarmodelmapper.h
index 239b3baa..40de5101 100644
--- a/src/charts/barchart/qvbarmodelmapper.h
+++ b/src/charts/barchart/qvbarmodelmapper.h
@@ -31,6 +31,7 @@
 #define QVBARMODELMAPPER_H
 
 #include <QtCharts/QBarModelMapper>
+Q_MOC_INCLUDE(<QtCore/qabstractitemmodel.h>)
 
 QT_CHARTS_BEGIN_NAMESPACE
 /* Comment line for syncqt to generate the fwd-include correctly, due to QTBUG-22432 */
diff --git a/src/charts/boxplotchart/qboxplotmodelmapper.h b/src/charts/boxplotchart/qboxplotmodelmapper.h
index e65f4dbf..44f92c8c 100644
--- a/src/charts/boxplotchart/qboxplotmodelmapper.h
+++ b/src/charts/boxplotchart/qboxplotmodelmapper.h
@@ -33,6 +33,8 @@
 #include <QtCharts/QChartGlobal>
 #include <QtCore/QObject>
 
+Q_MOC_INCLUDE(<QtCharts/qboxplotseries.h>)
+
 QT_BEGIN_NAMESPACE
 class QAbstractItemModel;
 QT_END_NAMESPACE
diff --git a/src/charts/boxplotchart/qhboxplotmodelmapper.h b/src/charts/boxplotchart/qhboxplotmodelmapper.h
index 364afd99..10353868 100644
--- a/src/charts/boxplotchart/qhboxplotmodelmapper.h
+++ b/src/charts/boxplotchart/qhboxplotmodelmapper.h
@@ -33,6 +33,9 @@
 
 #include <QtCharts/QBoxPlotModelMapper>
 
+Q_MOC_INCLUDE(<QtCharts/qboxplotseries.h>)
+Q_MOC_INCLUDE(<QtCore/qabstractitemmodel.h>)
+
 QT_CHARTS_BEGIN_NAMESPACE
 /* Comment line for syncqt to generate the fwd-include correctly, due to QTBUG-22432 */
 class Q_CHARTS_EXPORT QHBoxPlotModelMapper : public QBoxPlotModelMapper
diff --git a/src/charts/boxplotchart/qvboxplotmodelmapper.h b/src/charts/boxplotchart/qvboxplotmodelmapper.h
index 69a48852..1139da1c 100644
--- a/src/charts/boxplotchart/qvboxplotmodelmapper.h
+++ b/src/charts/boxplotchart/qvboxplotmodelmapper.h
@@ -32,6 +32,9 @@
 
 #include <QtCharts/QBoxPlotModelMapper>
 
+Q_MOC_INCLUDE(<QtCharts/qboxplotseries.h>)
+Q_MOC_INCLUDE(<QtCore/qabstractitemmodel.h>)
+
 QT_CHARTS_BEGIN_NAMESPACE
 /* Comment line for syncqt to generate the fwd-include correctly, due to QTBUG-22432 */
 class Q_CHARTS_EXPORT QVBoxPlotModelMapper : public QBoxPlotModelMapper
diff --git a/src/charts/candlestickchart/qcandlestickmodelmapper.h b/src/charts/candlestickchart/qcandlestickmodelmapper.h
index 70bd21d1..60e7428e 100644
--- a/src/charts/candlestickchart/qcandlestickmodelmapper.h
+++ b/src/charts/candlestickchart/qcandlestickmodelmapper.h
@@ -33,6 +33,9 @@
 #include <QtCharts/QChartGlobal>
 #include <QtCore/QObject>
 
+Q_MOC_INCLUDE(<QtCharts/qcandlestickseries.h>)
+Q_MOC_INCLUDE(<QtCore/qabstractitemmodel.h>)
+
 QT_BEGIN_NAMESPACE
 class QAbstractItemModel;
 QT_END_NAMESPACE
diff --git a/src/charts/charts.pro b/src/charts/charts.pro
index 5164f33f..4b2802a6 100644
--- a/src/charts/charts.pro
+++ b/src/charts/charts.pro
@@ -2,7 +2,7 @@
 
 TARGET = QtCharts
 
-QT = core gui widgets
+QT = core gui widgets opengl openglwidgets
 contains(QT_COORD_TYPE, float): DEFINES += QT_QREAL_IS_FLOAT
 
 QMAKE_DOCS = $$PWD/doc/qtcharts.qdocconf
diff --git a/src/charts/glwidget.cpp b/src/charts/glwidget.cpp
index 105e489a..207e91cb 100644
--- a/src/charts/glwidget.cpp
+++ b/src/charts/glwidget.cpp
@@ -32,9 +32,9 @@
 #include "private/glwidget_p.h"
 #include "private/glxyseriesdata_p.h"
 #include "private/qabstractseries_p.h"
-#include <QtGui/QOpenGLShaderProgram>
+#include <QtOpenGL/QOpenGLShaderProgram>
 #include <QtGui/QOpenGLContext>
-#include <QtGui/QOpenGLBuffer>
+#include <QtOpenGL/QOpenGLBuffer>
 
 //#define QDEBUG_TRACE_GL_FPS
 #ifdef QDEBUG_TRACE_GL_FPS
diff --git a/src/charts/glwidget_p.h b/src/charts/glwidget_p.h
index f2e85a34..761611aa 100644
--- a/src/charts/glwidget_p.h
+++ b/src/charts/glwidget_p.h
@@ -41,12 +41,12 @@
 
 #ifndef QT_NO_OPENGL
 
-#include <QtWidgets/QOpenGLWidget>
+#include <QtOpenGLWidgets/QOpenGLWidget>
 #include <QtWidgets/QGraphicsView>
 #include <QtGui/QOpenGLFunctions>
-#include <QtGui/QOpenGLVertexArrayObject>
-#include <QtGui/QOpenGLBuffer>
-#include <QtGui/QOpenGLFramebufferObject>
+#include <QtOpenGL/QOpenGLVertexArrayObject>
+#include <QtOpenGL/QOpenGLBuffer>
+#include <QtOpenGL/QOpenGLFramebufferObject>
 #include <QtCore/QHash>
 #include <QtCharts/QAbstractSeries>
 #include <QtCharts/QXYSeries>
diff --git a/src/charts/piechart/qhpiemodelmapper.h b/src/charts/piechart/qhpiemodelmapper.h
index 96b3cf39..ee223bb9 100644
--- a/src/charts/piechart/qhpiemodelmapper.h
+++ b/src/charts/piechart/qhpiemodelmapper.h
@@ -32,6 +32,9 @@
 
 #include <QtCharts/QPieModelMapper>
 
+Q_MOC_INCLUDE(<QtCharts/qpieseries.h>)
+Q_MOC_INCLUDE(<QtCore/qabstractitemmodel.h>)
+
 QT_CHARTS_BEGIN_NAMESPACE
 /* Comment line for syncqt to generate the fwd-include correctly, due to QTBUG-22432 */
 class Q_CHARTS_EXPORT QHPieModelMapper : public QPieModelMapper
diff --git a/src/charts/piechart/qpiemodelmapper.h b/src/charts/piechart/qpiemodelmapper.h
index db1af9dd..b05cd134 100644
--- a/src/charts/piechart/qpiemodelmapper.h
+++ b/src/charts/piechart/qpiemodelmapper.h
@@ -33,6 +33,8 @@
 #include <QtCharts/QChartGlobal>
 #include <QtCore/QObject>
 
+Q_MOC_INCLUDE(<QtCharts/qpieseries.h>)
+
 QT_BEGIN_NAMESPACE
 class QAbstractItemModel;
 QT_END_NAMESPACE
diff --git a/src/charts/piechart/qvpiemodelmapper.h b/src/charts/piechart/qvpiemodelmapper.h
index 37eded87..351dca6f 100644
--- a/src/charts/piechart/qvpiemodelmapper.h
+++ b/src/charts/piechart/qvpiemodelmapper.h
@@ -32,6 +32,9 @@
 
 #include <QtCharts/QPieModelMapper>
 
+Q_MOC_INCLUDE(<QtCharts/qpieseries.h>)
+Q_MOC_INCLUDE(<QtCore/qabstractitemmodel.h>)
+
 QT_CHARTS_BEGIN_NAMESPACE
 /* Comment line for syncqt to generate the fwd-include correctly, due to QTBUG-22432 */
 class Q_CHARTS_EXPORT QVPieModelMapper : public QPieModelMapper
diff --git a/src/charts/xychart/qhxymodelmapper.h b/src/charts/xychart/qhxymodelmapper.h
index 76251602..351af7c3 100644
--- a/src/charts/xychart/qhxymodelmapper.h
+++ b/src/charts/xychart/qhxymodelmapper.h
@@ -32,6 +32,9 @@
 
 #include <QtCharts/QXYModelMapper>
 
+Q_MOC_INCLUDE(<QtCharts/qxyseries.h>)
+Q_MOC_INCLUDE(<QtCore/qabstractitemmodel.h>)
+
 QT_CHARTS_BEGIN_NAMESPACE
 /* Comment line for syncqt to generate the fwd-include correctly, due to QTBUG-22432 */
 class Q_CHARTS_EXPORT QHXYModelMapper : public QXYModelMapper
diff --git a/src/charts/xychart/qvxymodelmapper.h b/src/charts/xychart/qvxymodelmapper.h
index 867b0a02..01723d16 100644
--- a/src/charts/xychart/qvxymodelmapper.h
+++ b/src/charts/xychart/qvxymodelmapper.h
@@ -32,6 +32,9 @@
 
 #include <QtCharts/QXYModelMapper>
 
+Q_MOC_INCLUDE(<QtCharts/qxyseries.h>)
+Q_MOC_INCLUDE(<QtCore/qabstractitemmodel.h>)
+
 QT_CHARTS_BEGIN_NAMESPACE
 /* Comment line for syncqt to generate the fwd-include correctly, due to QTBUG-22432 */
 class Q_CHARTS_EXPORT QVXYModelMapper : public QXYModelMapper
diff --git a/src/charts/xychart/qxymodelmapper.h b/src/charts/xychart/qxymodelmapper.h
index 7956aab8..815407a9 100644
--- a/src/charts/xychart/qxymodelmapper.h
+++ b/src/charts/xychart/qxymodelmapper.h
@@ -33,6 +33,8 @@
 #include <QtCharts/QChartGlobal>
 #include <QtCore/QObject>
 
+Q_MOC_INCLUDE(<QtCharts/qxyseries.h>)
+
 QT_BEGIN_NAMESPACE
 class QAbstractItemModel;
 QT_END_NAMESPACE
diff --git a/src/chartsqml2/chartsqml2.pro b/src/chartsqml2/chartsqml2.pro
index e7a2a4c5..514cf926 100644
--- a/src/chartsqml2/chartsqml2.pro
+++ b/src/chartsqml2/chartsqml2.pro
@@ -3,7 +3,7 @@ TARGET = qtchartsqml2
 CXX_MODULE = charts
 DEFINES += QT_BUILD_QMLCHARTS_LIB
 
-QT += qml quick
+QT += opengl qml quick
 QT += charts charts-private
 contains(QT_COORD_TYPE, float): DEFINES += QT_QREAL_IS_FLOAT
 
diff --git a/src/chartsqml2/declarativeareaseries_p.h b/src/chartsqml2/declarativeareaseries_p.h
index 18836768..9f2c2ab8 100644
--- a/src/chartsqml2/declarativeareaseries_p.h
+++ b/src/chartsqml2/declarativeareaseries_p.h
@@ -42,9 +42,9 @@
 #include <QtCharts/QAreaSeries>
 #include <private/declarativechartglobal_p.h>
 #include <private/declarativeaxes_p.h>
+#include <private/declarativelineseries_p.h>
 
 QT_CHARTS_BEGIN_NAMESPACE
-class DeclarativeLineSeries;
 
 class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeAreaSeries : public QAreaSeries
 {
diff --git a/src/chartsqml2/declarativeaxes_p.h b/src/chartsqml2/declarativeaxes_p.h
index c87f6a48..c7c1ac27 100644
--- a/src/chartsqml2/declarativeaxes_p.h
+++ b/src/chartsqml2/declarativeaxes_p.h
@@ -39,14 +39,12 @@
 #ifndef DECLARATIVEAXES_H
 #define DECLARATIVEAXES_H
 
-#include <QtCharts/QChartGlobal>
+#include <QtCharts/qabstractaxis.h>
 #include <QtCore/QObject>
 #include <private/declarativechartglobal_p.h>
 
 QT_CHARTS_BEGIN_NAMESPACE
 
-class QAbstractAxis;
-
 class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeAxes : public QObject
 {
     Q_OBJECT
diff --git a/src/chartsqml2/declarativecandlestickseries_p.h b/src/chartsqml2/declarativecandlestickseries_p.h
index 643d4d2f..80a49edc 100644
--- a/src/chartsqml2/declarativecandlestickseries_p.h
+++ b/src/chartsqml2/declarativecandlestickseries_p.h
@@ -40,6 +40,7 @@
 #define DECLARATIVECANDLESTICKSERIES_H
 
 #include <QtCharts/QCandlestickSeries>
+#include <QtCharts/qabstractaxis.h>
 #include <QtCharts/QCandlestickSet>
 #include <QtQml/QQmlParserStatus>
 #include <QtQuick/QQuickItem>
@@ -48,7 +49,6 @@
 QT_CHARTS_BEGIN_NAMESPACE
 
 class DeclarativeAxes;
-class QAbstractAxis;
 
 class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeCandlestickSet : public QCandlestickSet
 {
diff --git a/src/chartsqml2/declarativechart_p.h b/src/chartsqml2/declarativechart_p.h
index 0f45a3b8..a33bf77e 100644
--- a/src/chartsqml2/declarativechart_p.h
+++ b/src/chartsqml2/declarativechart_p.h
@@ -51,6 +51,9 @@
 #include <QtCore/QLocale>
 #include <QQmlComponent>
 
+Q_MOC_INCLUDE(<QtCharts/qlegend.h>)
+Q_MOC_INCLUDE("declarativemargins_p.h")
+
 QT_CHARTS_BEGIN_NAMESPACE
 
 class DeclarativeMargins;
diff --git a/src/chartsqml2/declarativeopenglrendernode.cpp b/src/chartsqml2/declarativeopenglrendernode.cpp
index 58f7aef6..c627daa3 100644
--- a/src/chartsqml2/declarativeopenglrendernode.cpp
+++ b/src/chartsqml2/declarativeopenglrendernode.cpp
@@ -31,10 +31,10 @@
 
 #include <QtGui/QOpenGLContext>
 #include <QtGui/QOpenGLFunctions>
-#include <QtGui/QOpenGLFramebufferObjectFormat>
-#include <QtGui/QOpenGLFramebufferObject>
+#include <QtOpenGL/QOpenGLFramebufferObjectFormat>
+#include <QtOpenGL/QOpenGLFramebufferObject>
 #include <QOpenGLShaderProgram>
-#include <QtGui/QOpenGLBuffer>
+#include <QtOpenGL/QOpenGLBuffer>
 
 //#define QDEBUG_TRACE_GL_FPS
 #ifdef QDEBUG_TRACE_GL_FPS
diff --git a/src/chartsqml2/declarativeopenglrendernode_p.h b/src/chartsqml2/declarativeopenglrendernode_p.h
index d4bb2372..ef91f9fd 100644
--- a/src/chartsqml2/declarativeopenglrendernode_p.h
+++ b/src/chartsqml2/declarativeopenglrendernode_p.h
@@ -45,11 +45,11 @@
 #include <private/glxyseriesdata_p.h>
 #include <QtQuick/QSGImageNode>
 #include <QtQuick/QQuickWindow>
-#include <QtGui/QOpenGLShaderProgram>
-#include <QtGui/QOpenGLVertexArrayObject>
+#include <QtOpenGL/QOpenGLShaderProgram>
+#include <QtOpenGL/QOpenGLVertexArrayObject>
 #include <QtGui/QOpenGLFunctions>
-#include <QtGui/QOpenGLFramebufferObject>
-#include <QtGui/QOpenGLBuffer>
+#include <QtOpenGL/QOpenGLFramebufferObject>
+#include <QtOpenGL/QOpenGLBuffer>
 
 QT_CHARTS_BEGIN_NAMESPACE
 
diff --git a/src/chartsqml2/declarativexyseries_p.h b/src/chartsqml2/declarativexyseries_p.h
index 883c4dbe..84f68a69 100644
--- a/src/chartsqml2/declarativexyseries_p.h
+++ b/src/chartsqml2/declarativexyseries_p.h
@@ -45,7 +45,6 @@
 QT_CHARTS_BEGIN_NAMESPACE
 
 class QChart;
-class QAbstractSeries;
 
 class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeXySeries
 {
diff --git a/tests/manual/boxplottester/customtablemodel.cpp b/tests/manual/boxplottester/customtablemodel.cpp
index 4521c7a4..b111165d 100644
--- a/tests/manual/boxplottester/customtablemodel.cpp
+++ b/tests/manual/boxplottester/customtablemodel.cpp
@@ -152,5 +152,5 @@ Qt::ItemFlags CustomTableModel::flags(const QModelIndex &index) const
 
 void CustomTableModel::addMapping(QString color, QRect area)
 {
-    m_mapping.insertMulti(color, area);
+    m_mapping.insert(color, area);
 }
diff --git a/tests/manual/boxplottester/customtablemodel.h b/tests/manual/boxplottester/customtablemodel.h
index 1c938a0d..196ab204 100644
--- a/tests/manual/boxplottester/customtablemodel.h
+++ b/tests/manual/boxplottester/customtablemodel.h
@@ -31,7 +31,7 @@
 #define CUSTOMTABLEMODEL_H
 
 #include <QtCore/QAbstractTableModel>
-#include <QtCore/QHash>
+#include <QtCore/QMultiHash>
 #include <QtCore/QRect>
 
 class CustomTableModel : public QAbstractTableModel
@@ -53,7 +53,7 @@ public:
 
 private:
     QList<QVector<qreal> *> m_data;
-    QHash<QString, QRect> m_mapping;
+    QMultiHash<QString, QRect> m_mapping;
     int m_columnCount;
     int m_rowCount;
 };
diff --git a/tests/manual/chartviewer/window.cpp b/tests/manual/chartviewer/window.cpp
index 85a6c956..d9214493 100644
--- a/tests/manual/chartviewer/window.cpp
+++ b/tests/manual/chartviewer/window.cpp
@@ -45,7 +45,7 @@
 #include <QtWidgets/QGraphicsScene>
 #include <QtWidgets/QGraphicsLinearLayout>
 #include <QtWidgets/QGraphicsProxyWidget>
-#include <QtWidgets/QOpenGLWidget>
+#include <QtOpenGLWidgets/QOpenGLWidget>
 #include <QtWidgets/QApplication>
 #include <QtCore/QDebug>
 #include <QtCore/QRegularExpression>
diff --git a/tests/manual/chartwidgettest/mainwidget.cpp b/tests/manual/chartwidgettest/mainwidget.cpp
index ebb00f22..4216fc07 100644
--- a/tests/manual/chartwidgettest/mainwidget.cpp
+++ b/tests/manual/chartwidgettest/mainwidget.cpp
@@ -52,7 +52,7 @@
 #include <QtCore/QRandomGenerator>
 #include <QtGui/QStandardItemModel>
 #include <QtCharts/QBarCategoryAxis>
-#include <QtWidgets/QOpenGLWidget>
+#include <QtOpenGLWidgets/QOpenGLWidget>
 
 #include <qmath.h>
 
diff --git a/tests/manual/wavechart/main.cpp b/tests/manual/wavechart/main.cpp
index e18dec6b..7991f2db 100644
--- a/tests/manual/wavechart/main.cpp
+++ b/tests/manual/wavechart/main.cpp
@@ -30,7 +30,7 @@
 #include "wavechart.h"
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QMainWindow>
-#include <QtWidgets/QOpenGLWidget>
+#include <QtOpenGLWidgets/QOpenGLWidget>
 
 int main(int argc, char *argv[])
 {
diff --git a/tests/tests.pri b/tests/tests.pri
index 8748acf1..c092d0f8 100644
--- a/tests/tests.pri
+++ b/tests/tests.pri
@@ -1,6 +1,6 @@
 TEMPLATE = app
 
-QT += charts
+QT += opengl openglwidgets charts
 
 contains(TARGET, qml.*) {
     QT += qml quick