Merge remote-tracking branch 'origin/5.12' into 5.13

Change-Id: I1dd136df7004b11e2f38a2ec4e82a6fa81627479

1 files changed, 2 insertions, 3 deletions

diff --git a/src/core/web_engine_settings.h b/src/core/web_engine_settings.h
index 8ed727524..8e1bb741c 100644
--- a/src/core/web_engine_settings.h
+++ b/src/core/web_engine_settings.h
@@ -57,6 +57,7 @@
 #include <QHash>
 #include <QUrl>
 #include <QSet>
+#include <QTimer>
 
 namespace content {
 struct RendererPreferences;
@@ -65,7 +66,6 @@ struct WebPreferences;
 }
 namespace QtWebEngineCore {
 
-class BatchTimer;
 class WebContentsAdapter;
 
 class QWEBENGINECORE_PRIVATE_EXPORT WebEngineSettings {
@@ -178,7 +178,7 @@ private:
     QHash<FontSize, int> m_fontSizes;
     QString m_defaultEncoding;
     QScopedPointer<content::WebPreferences> webPreferences;
-    QScopedPointer<BatchTimer> m_batchTimer;
+    QTimer m_batchTimer;
 
     WebEngineSettings *parentSettings;
     QSet<WebEngineSettings *> childSettings;
@@ -188,7 +188,6 @@ private:
     static QHash<FontSize, int> s_defaultFontSizes;
     UnknownUrlSchemePolicy m_unknownUrlSchemePolicy;
 
-    friend class BatchTimer;
     friend class WebContentsAdapter;
 };