1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add missing qHash overload for INTEGRITY

Browse Source 
Fixes build issue "no instance of overloaded function "qHash" matches
the argument list" on INTEGRITY

Change-Id: Ia1273587840d55199846dc64d487d194f9a4d565
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
(cherry picked from commit 56ed35bd02e7c99f0d61f02013beefb32ad59b8e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Kimmo Ollila 2021-06-09 14:34:24 +03:00 committed by Qt Cherry-pick Bot
parent 662bb0e83b
commit 449ce16392
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/rhi/qshader.cpp
View File

@ -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)

5
src/gui/rhi/qshader_p.h
View File

@ -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: