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

Change-Id: I1dd136df7004b11e2f38a2ec4e82a6fa81627479

1 files changed, 8 insertions, 26 deletions

diff --git a/src/core/web_engine_settings.cpp b/src/core/web_engine_settings.cpp
index a652469cb..705c0c106 100644
--- a/src/core/web_engine_settings.cpp
+++ b/src/core/web_engine_settings.cpp
@@ -67,27 +67,6 @@ QHash<WebEngineSettings::FontSize, int> WebEngineSettings::s_defaultFontSizes;
 
 static const int batchTimerTimeout = 0;
 
-class BatchTimer : public QTimer {
-    Q_OBJECT
-public:
-    BatchTimer(WebEngineSettings *settings)
-        : m_settings(settings)
-    {
-        setSingleShot(true);
-        setInterval(batchTimerTimeout);
-        connect(this, SIGNAL(timeout()), SLOT(onTimeout()));
-    }
-
-private Q_SLOTS:
-    void onTimeout()
-    {
-        m_settings->doApply();
-    }
-
-private:
-    WebEngineSettings *m_settings;
-};
-
 static inline bool isTouchEventsAPIEnabled() {
     static bool initialized = false;
     static bool touchEventsAPIEnabled = false;
@@ -113,12 +92,17 @@ static inline bool isTouchEventsAPIEnabled() {
 
 WebEngineSettings::WebEngineSettings(WebEngineSettings *_parentSettings)
     : m_adapter(0)
-    , m_batchTimer(new BatchTimer(this))
     , parentSettings(_parentSettings)
     , m_unknownUrlSchemePolicy(WebEngineSettings::InheritedUnknownUrlSchemePolicy)
 {
     if (parentSettings)
         parentSettings->childSettings.insert(this);
+
+    m_batchTimer.setSingleShot(true);
+    m_batchTimer.setInterval(batchTimerTimeout);
+    QObject::connect(&m_batchTimer, &QTimer::timeout, [this]() {
+        doApply();
+    });
 }
 
 WebEngineSettings::~WebEngineSettings()
@@ -340,8 +324,8 @@ void WebEngineSettings::initDefaults()
 
 void WebEngineSettings::scheduleApply()
 {
-    if (!m_batchTimer->isActive())
-        m_batchTimer->start();
+    if (!m_batchTimer.isActive())
+        m_batchTimer.start();
 }
 
 void WebEngineSettings::doApply()
@@ -453,5 +437,3 @@ void WebEngineSettings::setParentSettings(WebEngineSettings *_parentSettings)
 }
 
 } // namespace QtWebEngineCore
-
-#include "web_engine_settings.moc"