2 files changed, 11 insertions, 10 deletions

diff --git a/src/network/access/qhsts.cpp b/src/network/access/qhsts.cpp
index 6a731afc2f..43a8a3663e 100644
--- a/src/network/access/qhsts.cpp
+++ b/src/network/access/qhsts.cpp
@@ -136,7 +136,7 @@ void QHstsCache::updateKnownHost(const QString &host, const QDateTime &expires,
             return;
         }
 
-        knownHosts.insert(pos, hostName, newPolicy);
+        knownHosts.insert(pos, {hostName, newPolicy});
         if (hstsStore)
             hstsStore->addToObserved(newPolicy);
         return;
@@ -144,8 +144,8 @@ void QHstsCache::updateKnownHost(const QString &host, const QDateTime &expires,
 
     if (newPolicy.isExpired())
         knownHosts.erase(pos);
-    else  if (*pos != newPolicy)
-        *pos = std::move(newPolicy);
+    else  if (pos->second != newPolicy)
+        pos->second = std::move(newPolicy);
     else
         return;
 
@@ -185,13 +185,13 @@ bool QHstsCache::isKnownHost(const QUrl &url) const
     while (nameToTest.fragment.size()) {
         auto const pos = knownHosts.find(nameToTest);
         if (pos != knownHosts.end()) {
-            if (pos.value().isExpired()) {
+            if (pos->second.isExpired()) {
                 knownHosts.erase(pos);
                 if (hstsStore) {
                     // Inform our store that this policy has expired.
-                    hstsStore->addToObserved(pos.value());
+                    hstsStore->addToObserved(pos->second);
                 }
-            } else if (!superDomainMatch || pos.value().includesSubDomains()) {
+            } else if (!superDomainMatch || pos->second.includesSubDomains()) {
                 return true;
             }
         }
@@ -215,9 +215,9 @@ void QHstsCache::clear()
 QVector<QHstsPolicy> QHstsCache::policies() const
 {
     QVector<QHstsPolicy> values;
-    values.reserve(knownHosts.size());
+    values.reserve(int(knownHosts.size()));
     for (const auto &host : knownHosts)
-        values << host;
+        values << host.second;
     return values;
 }
 
diff --git a/src/network/access/qhsts_p.h b/src/network/access/qhsts_p.h
index 2feb73b446..bc8708341d 100644
--- a/src/network/access/qhsts_p.h
+++ b/src/network/access/qhsts_p.h
@@ -61,7 +61,8 @@
 #include <QtCore/qglobal.h>
 #include <QtCore/qpair.h>
 #include <QtCore/qurl.h>
-#include <QtCore/qmap.h>
+
+#include <map>
 
 QT_BEGIN_NAMESPACE
 
@@ -117,7 +118,7 @@ private:
         QStringRef fragment;
     };
 
-    mutable QMap<HostName, QHstsPolicy> knownHosts;
+    mutable std::map<HostName, QHstsPolicy> knownHosts;
     QHstsStore *hstsStore = nullptr;
 };