1 files changed, 35 insertions, 8 deletions

diff --git a/src/corelib/tools/qmap.h b/src/corelib/tools/qmap.h
index 9ba01bee2c..7ee0be1e51 100644
--- a/src/corelib/tools/qmap.h
+++ b/src/corelib/tools/qmap.h
@@ -5,6 +5,7 @@
 #ifndef QMAP_H
 #define QMAP_H
 
+#include <QtCore/qhashfunctions.h>
 #include <QtCore/qiterator.h>
 #include <QtCore/qlist.h>
 #include <QtCore/qrefcount.h>
@@ -240,7 +241,7 @@ public:
         return {};
     }
 
-#ifndef Q_CLANG_QDOC
+#ifndef Q_QDOC
     template <typename AKey = Key, typename AT = T> friend
     QTypeTraits::compare_eq_result_container<QMap, AKey, AT> operator==(const QMap &lhs, const QMap &rhs)
     {
@@ -261,7 +262,7 @@ public:
 #else
     friend bool operator==(const QMap &lhs, const QMap &rhs);
     friend bool operator!=(const QMap &lhs, const QMap &rhs);
-#endif // Q_CLANG_QDOC
+#endif // Q_QDOC
 
     size_type size() const { return d ? size_type(d->m.size()) : size_type(0); }
 
@@ -762,7 +763,7 @@ public:
         return isEmpty();
     }
 
-    QPair<iterator, iterator> equal_range(const Key &akey)
+    std::pair<iterator, iterator> equal_range(const Key &akey)
     {
         const auto copy = d.isShared() ? *this : QMap(); // keep `key` alive across the detach
         detach();
@@ -770,13 +771,38 @@ public:
         return {iterator(result.first), iterator(result.second)};
     }
 
-    QPair<const_iterator, const_iterator> equal_range(const Key &akey) const
+    std::pair<const_iterator, const_iterator> equal_range(const Key &akey) const
     {
         if (!d)
             return {};
         auto result = d->m.equal_range(akey);
         return {const_iterator(result.first), const_iterator(result.second)};
     }
+
+private:
+#ifdef Q_QDOC
+    friend size_t qHash(const QMap &key, size_t seed = 0);
+#else
+# if defined(Q_CC_GHS) || defined (Q_CC_MSVC)
+    // GHS and MSVC tries to intantiate qHash() for the noexcept running into a
+    // non-SFINAE'ed hard error... Create an artificial SFINAE context as a
+    // work-around:
+    template <typename M, std::enable_if_t<std::is_same_v<M, QMap>, bool> = true>
+    friend QtPrivate::QHashMultiReturnType<typename M::key_type, typename M::mapped_type>
+# else
+    using M = QMap;
+    friend size_t
+# endif
+    qHash(const M &key, size_t seed = 0)
+        noexcept(QHashPrivate::noexceptPairHash<typename M::key_type, typename M::mapped_type>())
+    {
+        if (!key.d)
+            return seed;
+        // don't use qHashRange to avoid its compile-time overhead:
+        return std::accumulate(key.d->m.begin(), key.d->m.end(), seed,
+                               QtPrivate::QHashCombine{});
+    }
+#endif // !Q_QDOC
 };
 
 Q_DECLARE_ASSOCIATIVE_ITERATOR(Map)
@@ -788,6 +814,7 @@ qsizetype erase_if(QMap<Key, T> &map, Predicate pred)
     return QtPrivate::associative_erase_if(map, pred);
 }
 
+
 //
 // QMultiMap
 //
@@ -885,7 +912,7 @@ public:
         return {};
     }
 
-#ifndef Q_CLANG_QDOC
+#ifndef Q_QDOC
     template <typename AKey = Key, typename AT = T> friend
     QTypeTraits::compare_eq_result_container<QMultiMap, AKey, AT> operator==(const QMultiMap &lhs, const QMultiMap &rhs)
     {
@@ -906,7 +933,7 @@ public:
 #else
     friend bool operator==(const QMultiMap &lhs, const QMultiMap &rhs);
     friend bool operator!=(const QMultiMap &lhs, const QMultiMap &rhs);
-#endif // Q_CLANG_QDOC
+#endif // Q_QDOC
 
     size_type size() const { return d ? size_type(d->m.size()) : size_type(0); }
 
@@ -1492,7 +1519,7 @@ public:
     // STL compatibility
     inline bool empty() const { return isEmpty(); }
 
-    QPair<iterator, iterator> equal_range(const Key &akey)
+    std::pair<iterator, iterator> equal_range(const Key &akey)
     {
         const auto copy = d.isShared() ? *this : QMultiMap(); // keep `key` alive across the detach
         detach();
@@ -1500,7 +1527,7 @@ public:
         return {iterator(result.first), iterator(result.second)};
     }
 
-    QPair<const_iterator, const_iterator> equal_range(const Key &akey) const
+    std::pair<const_iterator, const_iterator> equal_range(const Key &akey) const
     {
         if (!d)
             return {};