Merge remote-tracking branch 'origin/5.15' into dev

Conflicts:
	src/pdf/quick/qquickpdfselection_p.h

Change-Id: I6eec37a01347c2d47cbfc1114326dfc6b58719ff

1 files changed, 7 insertions, 2 deletions

diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
index 2c7cc83d1..08c471763 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
@@ -106,7 +106,7 @@ RenderWidgetHostViewQtDelegateWidget::RenderWidgetHostViewQtDelegateWidget(Rende
     format.setDepthBufferSize(24);
     format.setStencilBufferSize(8);
 
-#ifndef QT_NO_OPENGL
+#if QT_CONFIG(opengl)
     QOpenGLContext *globalSharedContext = QOpenGLContext::globalShareContext();
     if (globalSharedContext) {
         QSurfaceFormat sharedFormat = globalSharedContext->format();
@@ -473,11 +473,16 @@ bool RenderWidgetHostViewQtDelegateWidget::event(QEvent *event)
 
     if (!handled)
         return QQuickWidget::event(event);
-    // Most events are accepted by default, but tablet events are not:
     event->accept();
     return true;
 }
 
+void RenderWidgetHostViewQtDelegateWidget::unhandledWheelEvent(QWheelEvent *ev)
+{
+    if (QWidget *p = parentWidget())
+        qApp->sendEvent(p, ev);
+}
+
 void RenderWidgetHostViewQtDelegateWidget::onWindowPosChanged()
 {
     m_client->visualPropertiesChanged();