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

Change-Id: I0dd7c64669f4b130047a4a3836f62f7ee5b5f8d9

1 files changed, 5 insertions, 0 deletions

diff --git a/src/core/api/qwebenginecontextmenurequest.h b/src/core/api/qwebenginecontextmenurequest.h
index bc8095dc9..d9041d797 100644
--- a/src/core/api/qwebenginecontextmenurequest.h
+++ b/src/core/api/qwebenginecontextmenurequest.h
@@ -46,6 +46,10 @@
 #include <QtCore/QPoint>
 #include <QScopedPointer>
 
+namespace extensions {
+class MimeHandlerViewGuestDelegateQt;
+}
+
 namespace QtWebEngineCore {
 class RenderViewContextMenuQt;
 class WebContentsViewQt;
@@ -156,6 +160,7 @@ private:
     QScopedPointer<QWebEngineContextMenuRequestPrivate> d;
     friend class QtWebEngineCore::WebContentsViewQt;
     friend class QtWebEngineCore::RenderViewContextMenuQt;
+    friend class extensions::MimeHandlerViewGuestDelegateQt;
     friend class QQuickWebEngineViewPrivate;
     friend class QQuickWebEngineView;
     friend class ContextMenuRequestJSWrapper;