feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Collapse most of porting,h

Browse Source 
Taking the Qt 6 branches, leaving some dummies until downstream
adapted.

Change-Id: Ib9b86568d73c341c8f740ba497c3cbfab830d8a1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
hjk
2022-07-13 09:27:18 +02:00
parent 480da99508
commit 802de0eb5e
82 changed files with 206 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/qmljs/qmljslink.cpp
View File

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