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

Fix qHash-related size compatibility warnings by MSVC

Browse Source 
Change-Id: I3b7981ce78b67db4b996f99682284a0b911d8cd7
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Orgad Shaneh
2021-10-14 22:27:08 +03:00
committed by Orgad Shaneh
parent 11c73adbe0
commit 3871e40f43
58 changed files with 126 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cmakeprojectmanager/cmakeconfigitem.cpp
View File

@@ -472,7 +472,7 @@ bool CMakeConfigItem::operator==(const CMakeConfigItem &o) const
return o.key == key && o.value == value && o.isUnset == isUnset;
}
uint qHash(const CMakeConfigItem &it)
Utils::QHashValueType qHash(const CMakeConfigItem &it)
{
return ::qHash(it.key) ^ ::qHash(it.value) ^ ::qHash(it.isUnset);
}

3
src/plugins/cmakeprojectmanager/cmakeconfigitem.h
View File

@@ -27,6 +27,7 @@
#include "cmake_global.h"
#include <utils/porting.h>
#include <utils/optional.h>
#include <QByteArray>
@@ -78,7 +79,7 @@ public:
QStringList values;
};
uint qHash(const CMakeConfigItem &it); // needed for MSVC
Utils::QHashValueType qHash(const CMakeConfigItem &it); // needed for MSVC
class CMAKE_EXPORT CMakeConfig : public QList<CMakeConfigItem>
{

2
src/plugins/cmakeprojectmanager/fileapidataextractor.h
View File

@@ -56,7 +56,7 @@ public:
bool isGenerated = false;
};
inline uint qHash(const CMakeFileInfo &info, uint seed = 0) { return info.path.hash(seed); }
inline auto qHash(const CMakeFileInfo &info, uint seed = 0) { return info.path.hash(seed); }
class FileApiQtcData
{