From 449ce163924e6f14489201400cb32a0768abdb46 Mon Sep 17 00:00:00 2001 From: Kimmo Ollila Date: Wed, 9 Jun 2021 14:34:24 +0300 Subject: [PATCH] Add missing qHash overload for INTEGRITY Fixes build issue "no instance of overloaded function "qHash" matches the argument list" on INTEGRITY Change-Id: Ia1273587840d55199846dc64d487d194f9a4d565 Reviewed-by: Laszlo Agocs (cherry picked from commit 56ed35bd02e7c99f0d61f02013beefb32ad59b8e) Reviewed-by: Qt Cherry-pick Bot --- src/gui/rhi/qshader.cpp | 7 +++++++ src/gui/rhi/qshader_p.h | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/src/gui/rhi/qshader.cpp b/src/gui/rhi/qshader.cpp index 85cb5fade70..74255dcf5c2 100644 --- a/src/gui/rhi/qshader.cpp +++ b/src/gui/rhi/qshader.cpp @@ -558,6 +558,13 @@ bool operator==(const QShaderVersion &lhs, const QShaderVersion &rhs) noexcept return lhs.version() == rhs.version() && lhs.flags() == rhs.flags(); } +#ifdef Q_OS_INTEGRITY +size_t qHash(const QShaderVersion &s, size_t seed) noexcept +{ + return qHashMulti(seed, s.version(), s.flags()); +} +#endif + /*! \internal \fn bool operator!=(const QShaderVersion &lhs, const QShaderVersion &rhs) diff --git a/src/gui/rhi/qshader_p.h b/src/gui/rhi/qshader_p.h index d7b9892b8ff..b320340229b 100644 --- a/src/gui/rhi/qshader_p.h +++ b/src/gui/rhi/qshader_p.h @@ -59,6 +59,11 @@ QT_BEGIN_NAMESPACE struct QShaderPrivate; class QShaderKey; +#ifdef Q_OS_INTEGRITY + class QShaderVersion; + size_t qHash(const QShaderVersion &, size_t = 0) noexcept; +#endif + class Q_GUI_EXPORT QShaderVersion { public: