summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_tools_qhash.cpp4
-rw-r--r--src/corelib/tools/qhash.cpp15
2 files changed, 0 insertions, 19 deletions
diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qhash.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qhash.cpp
index 344fbb241db..77981075a23 100644
--- a/src/corelib/doc/snippets/code/src_corelib_tools_qhash.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_tools_qhash.cpp
@@ -335,10 +335,6 @@ inline size_t qHash(const std::unordered_set<int> &key, size_t seed = 0)
}
//! [qhashrangecommutative]
-//! [29]
-qHash(qMakePair(key.first, key.second), seed);
-//! [29]
-
//! [30]
{0, 1, 2}
//! [30]
diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp
index 06e211b9a24..9ca49f13eb4 100644
--- a/src/corelib/tools/qhash.cpp
+++ b/src/corelib/tools/qhash.cpp
@@ -714,16 +714,6 @@ uint qt_hash(QStringView key, uint chained) noexcept
}
/*!
- \fn template <typename T1, typename T2> size_t qHash(const QPair<T1, T2> &key, size_t seed = 0)
- \since 5.0
- \relates QHash
-
- Returns the hash value for the \a key, using \a seed to seed the calculation.
-
- Types \c T1 and \c T2 must be supported by qHash().
-*/
-
-/*!
\fn template <typename T1, typename T2> size_t qHash(const std::pair<T1, T2> &key, size_t seed = 0)
\since 5.7
\relates QHash
@@ -731,11 +721,6 @@ uint qt_hash(QStringView key, uint chained) noexcept
Returns the hash value for the \a key, using \a seed to seed the calculation.
Types \c T1 and \c T2 must be supported by qHash().
-
- \note The return type of this function is \e{not} the same as that of
- \snippet code/src_corelib_tools_qhash.cpp 29
- The two functions use different hashing algorithms; due to binary compatibility
- constraints, we cannot change the QPair algorithm to match the std::pair one before Qt 6.
*/
/*!