From 802de0eb5ee4d29a1e75764880989ba572f6af27 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 13 Jul 2022 09:27:18 +0200 Subject: Utils: Collapse most of porting,h Taking the Qt 6 branches, leaving some dummies until downstream adapted. Change-Id: Ib9b86568d73c341c8f740ba497c3cbfab830d8a1 Reviewed-by: Eike Ziller Reviewed-by: Qt CI Bot --- src/libs/qmljs/qmljslink.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/libs/qmljs/qmljslink.cpp') diff --git a/src/libs/qmljs/qmljslink.cpp b/src/libs/qmljs/qmljslink.cpp index df881a09ab..758e3a7add 100644 --- a/src/libs/qmljs/qmljslink.cpp +++ b/src/libs/qmljs/qmljslink.cpp @@ -55,7 +55,7 @@ public: {} private: - friend Utils::QHashValueType qHash(const ImportCacheKey &); + friend size_t qHash(const ImportCacheKey &); friend bool operator==(const ImportCacheKey &, const ImportCacheKey &); int m_type; @@ -64,7 +64,7 @@ private: int m_minorVersion; }; -Utils::QHashValueType qHash(const ImportCacheKey &info) +size_t qHash(const ImportCacheKey &info) { return ::qHash(info.m_type) ^ ::qHash(info.m_path) ^ ::qHash(info.m_majorVersion) ^ ::qHash(info.m_minorVersion); -- cgit v1.2.1