From 2d2104da7cf308e92d68b2066df66aa897bfac92 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 2 Dec 2021 10:53:04 +0100 Subject: 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 Reviewed-by: Qt CI Bot --- src/widgets/kernel/qsizepolicy.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/widgets/kernel/qsizepolicy.h') diff --git a/src/widgets/kernel/qsizepolicy.h b/src/widgets/kernel/qsizepolicy.h index 5e948175f3..53c7afc906 100644 --- a/src/widgets/kernel/qsizepolicy.h +++ b/src/widgets/kernel/qsizepolicy.h @@ -43,14 +43,13 @@ #include #include #include +#include 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; -- cgit v1.2.3