From 2d2104da7cf308e92d68b2066df66aa897bfac92 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@qt.io>
Date: Thu, 2 Dec 2021 10:53:04 +0100
Subject: [PATCH] QSizePolicy: make qHash() a hidden friend

Less noisy compiler error messages.

[ChangeLog][Potentially Source-Incompatible Changes][QSizePolicy]
qHash() is now a hidden friend and can only be called by unqualified
(qHash(sp)), not by qualified lookup (as in, say, ::qHash(sp) or
QT_PREPEND_NAMESPACE(qHash)(sp)).

Task-number: QTBUG-98863
Change-Id: I37d26c661c2d8bb74350eb9378bd19fa426678d2
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
---
 src/widgets/kernel/qsizepolicy.cpp | 3 +--
 src/widgets/kernel/qsizepolicy.h   | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/widgets/kernel/qsizepolicy.cpp b/src/widgets/kernel/qsizepolicy.cpp
index c354d14f5e1..fe34ef5982b 100644
--- a/src/widgets/kernel/qsizepolicy.cpp
+++ b/src/widgets/kernel/qsizepolicy.cpp
@@ -317,9 +317,8 @@ void QSizePolicy::setControlType(ControlType type) noexcept
 */
 
 /*!
-    \fn size_t qHash(QSizePolicy key, size_t seed = 0)
+    \fn size_t QSizePolicy::qHash(QSizePolicy key, size_t seed = 0)
     \since 5.6
-    \relates QSizePolicy
 
     Returns the hash value for \a key, using
     \a seed to seed the calculation.
diff --git a/src/widgets/kernel/qsizepolicy.h b/src/widgets/kernel/qsizepolicy.h
index 5e948175f31..53c7afc9069 100644
--- a/src/widgets/kernel/qsizepolicy.h
+++ b/src/widgets/kernel/qsizepolicy.h
@@ -43,14 +43,13 @@
 #include <QtWidgets/qtwidgetsglobal.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qalgorithms.h>
+#include <QtCore/qhashfunctions.h>
 
 QT_BEGIN_NAMESPACE
 
 class QVariant;
 class QSizePolicy;
 
-Q_DECL_CONST_FUNCTION inline size_t qHash(QSizePolicy key, size_t seed = 0) noexcept;
-
 class Q_WIDGETS_EXPORT QSizePolicy
 {
     Q_GADGET
@@ -122,7 +121,7 @@ public:
     constexpr bool operator==(const QSizePolicy& s) const noexcept { return data == s.data; }
     constexpr bool operator!=(const QSizePolicy& s) const noexcept { return data != s.data; }
 
-    friend Q_DECL_CONST_FUNCTION size_t qHash(QSizePolicy key, size_t seed) noexcept { return qHash(key.data, seed); }
+    friend Q_DECL_CONST_FUNCTION size_t qHash(QSizePolicy key, size_t seed = 0) noexcept { return qHash(key.data, seed); }
 
     operator QVariant() const;