forked from qt-creator/qt-creator
Fix qHash-related size compatibility warnings by MSVC
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:
committed by
Orgad Shaneh
parent
11c73adbe0
commit
3871e40f43
@@ -32,6 +32,7 @@
|
||||
#include "qmljsmodelmanagerinterface.h"
|
||||
#include "qmljsconstants.h"
|
||||
|
||||
#include <utils/porting.h>
|
||||
#include <utils/qrcparser.h>
|
||||
|
||||
#include <QDir>
|
||||
@@ -54,7 +55,7 @@ public:
|
||||
{}
|
||||
|
||||
private:
|
||||
friend uint qHash(const ImportCacheKey &);
|
||||
friend Utils::QHashValueType qHash(const ImportCacheKey &);
|
||||
friend bool operator==(const ImportCacheKey &, const ImportCacheKey &);
|
||||
|
||||
int m_type;
|
||||
@@ -63,7 +64,7 @@ private:
|
||||
int m_minorVersion;
|
||||
};
|
||||
|
||||
uint qHash(const ImportCacheKey &info)
|
||||
Utils::QHashValueType qHash(const ImportCacheKey &info)
|
||||
{
|
||||
return ::qHash(info.m_type) ^ ::qHash(info.m_path) ^
|
||||
::qHash(info.m_majorVersion) ^ ::qHash(info.m_minorVersion);
|
||||
|
||||
Reference in New Issue
Block a user