From c9d902ca6ca3b1aa2e2762329d18c226d26520af Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Fri, 6 Nov 2020 09:16:15 +0100
Subject: Adaptations for Chromium 87

Change-Id: Ic4ffd98e02f986dbaf986405360e727c813e696e
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
---
 src/core/web_engine_settings.h | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/core/web_engine_settings.h')

diff --git a/src/core/web_engine_settings.h b/src/core/web_engine_settings.h
index 95eea669f..d97ff5767 100644
--- a/src/core/web_engine_settings.h
+++ b/src/core/web_engine_settings.h
@@ -61,12 +61,15 @@
 
 namespace content {
 class WebContents;
-struct WebPreferences;
 }
+
 namespace blink {
 namespace mojom {
 class RendererPreferences;
 }
+namespace web_pref {
+struct WebPreferences;
+}
 }
 namespace QtWebEngineCore {
 
@@ -142,7 +145,7 @@ public:
 
     void setParentSettings(WebEngineSettings *parentSettings);
 
-    void overrideWebPreferences(content::WebContents *webContents, content::WebPreferences *prefs);
+    void overrideWebPreferences(content::WebContents *webContents, blink::web_pref::WebPreferences *prefs);
 
     void setAttribute(Attribute, bool on);
     bool testAttribute(Attribute) const;
@@ -172,7 +175,7 @@ public:
 
 private:
     void doApply();
-    void applySettingsToWebPreferences(content::WebPreferences *);
+    void applySettingsToWebPreferences(blink::web_pref::WebPreferences *);
     bool applySettingsToRendererPreferences(blink::mojom::RendererPreferences *);
     void setWebContentsAdapter(WebContentsAdapter *adapter) { m_adapter = adapter; }
 
@@ -181,7 +184,7 @@ private:
     QHash<FontFamily, QString> m_fontFamilies;
     QHash<FontSize, int> m_fontSizes;
     QString m_defaultEncoding;
-    QScopedPointer<content::WebPreferences> webPreferences;
+    QScopedPointer<blink::web_pref::WebPreferences> webPreferences;
     QTimer m_batchTimer;
 
     WebEngineSettings *parentSettings;
-- 
cgit v1.2.3