Merge branch '5.6' into dev

Change-Id: I038f3544785862f3a2e2f35b8fab0b163e75d542

1 files changed, 9 insertions, 9 deletions

diff --git a/src/core/browser_context_adapter.cpp b/src/core/browser_context_adapter.cpp
index a8f704995..8f1311bb4 100644
--- a/src/core/browser_context_adapter.cpp
+++ b/src/core/browser_context_adapter.cpp
@@ -54,8 +54,6 @@
 #include <QString>
 #include <QStandardPaths>
 
-#include <numeric>
-
 namespace {
 inline QString buildLocationFromStandardPath(const QString &standardPath, const QString &name) {
     QString location = standardPath;
@@ -363,13 +361,13 @@ bool BrowserContextAdapter::removeCustomUrlSchemeHandler(QWebEngineUrlSchemeHand
 {
     bool removedOneOrMore = false;
     auto it = m_customUrlSchemeHandlers.begin();
-    auto end = m_customUrlSchemeHandlers.end();
-    for (; it != end; ++it) {
+    while (it != m_customUrlSchemeHandlers.end()) {
         if (it.value() == handler) {
             it = m_customUrlSchemeHandlers.erase(it);
             removedOneOrMore = true;
             continue;
         }
+        ++it;
     }
     if (removedOneOrMore)
         updateCustomUrlSchemeHandlers();
@@ -405,11 +403,13 @@ void BrowserContextAdapter::permissionRequestReply(const QUrl &origin, Permissio
 QString BrowserContextAdapter::httpAcceptLanguageWithoutQualities() const
 {
     const QStringList list = m_httpAcceptLanguage.split(QLatin1Char(','));
-    return std::accumulate(list.constBegin(), list.constEnd(), QString(),
-                    [](const QString &r, const QString &e) {
-        return (r.isEmpty() ? r : r + QString(QLatin1Char(',')))
-                + e.split(QLatin1Char(';')).first();
-    });
+    QString out;
+    Q_FOREACH (const QString& str, list) {
+        if (!out.isEmpty())
+            out.append(QLatin1Char(','));
+        out.append(str.split(QLatin1Char(';')).first());
+    }
+    return out;
 }
 
 QString BrowserContextAdapter::httpAcceptLanguage() const