1 files changed, 20 insertions, 19 deletions

diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp
index 9b69c79389..8540b1bbb1 100644
--- a/src/corelib/tools/qhash.cpp
+++ b/src/corelib/tools/qhash.cpp
@@ -111,22 +111,18 @@ private:
 #else
     // can't use qEnvironmentVariableIntValue (reentrancy)
     const char *seedstr = getenv("QT_HASH_SEED");
-    const char *endptr = nullptr;
-    bool ok = false;
-    int seed = 0;
-    if (seedstr)
-        seed = qstrntoll(seedstr, strlen(seedstr), &endptr, 10, &ok);
-    if (ok && endptr != seedstr + strlen(seedstr))
-        ok = false;
-    if (ok) {
-        if (seed) {
-            // can't use qWarning here (reentrancy)
-            fprintf(stderr, "QT_HASH_SEED: forced seed value is not 0; ignored.\n");
+    if (seedstr) {
+        auto r = qstrntoll(seedstr, strlen(seedstr), 10);
+        if (r.endptr == seedstr + strlen(seedstr)) {
+            if (r.result) {
+                // can't use qWarning here (reentrancy)
+                fprintf(stderr, "QT_HASH_SEED: forced seed value is not 0; ignored.\n");
+            }
+
+            // we don't have to store to the seed, since it's pre-initialized by
+            // the compiler to zero
+            return result;
         }
-
-        // we don't have to store to the seed, since it's pre-initialized by
-        // the compiler to zero
-        return result;
     }
 
     // update the full seed
@@ -1683,10 +1679,15 @@ size_t qHash(long double key, size_t seed) noexcept
 
     The two-arguments overloads take an unsigned integer that should be used to
     seed the calculation of the hash function. This seed is provided by QHash
-    in order to prevent a family of \l{algorithmic complexity attacks}. If both
-    a one-argument and a two-arguments overload are defined for a key type,
-    the latter is used by QHash (note that you can simply define a
-    two-arguments version, and use a default value for the seed parameter).
+    in order to prevent a family of \l{algorithmic complexity attacks}.
+
+    \note In Qt 6 it is possible to define a \c{qHash()} overload
+    taking only one argument; support for this is deprecated. Starting
+    with Qt 7, it will be mandatory to use a two-arguments overload. If
+    both a one-argument and a two-arguments overload are defined for a
+    key type, the latter is used by QHash (note that you can simply
+    define a two-arguments version, and use a default value for the
+    seed parameter).
 
     The second way to provide a hashing function is by specializing
     the \c{std::hash} class for the key type \c{K}, and providing a