diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-04-16 12:54:59 +0200 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-04-16 14:47:55 +0200 |
| commit | c3fcbe73189b26e49ad8fa824b2b8e6b7db0a8f4 (patch) | |
| tree | b603742c87fcb512c13a5eb2a02a3ff59c34d543 /src/qmldebug | |
| parent | 3768ec496cb8be1b8bedafd08c19732a405dfeea (diff) | |
Change qHash return value to size_t
Else on Windows there's a warning:
conversion from 'size_t' to 'uint', possible loss of data
Change-Id: Ifed4899409a13fed31c206ae1e0f195280ee2925
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/qmldebug')
| -rw-r--r-- | src/qmldebug/qqmlprofilereventlocation_p.h | 2 | ||||
| -rw-r--r-- | src/qmldebug/qqmlprofilereventtype_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qmldebug/qqmlprofilereventlocation_p.h b/src/qmldebug/qqmlprofilereventlocation_p.h index 6f37eab14b..beec3a0eb0 100644 --- a/src/qmldebug/qqmlprofilereventlocation_p.h +++ b/src/qmldebug/qqmlprofilereventlocation_p.h @@ -103,7 +103,7 @@ inline bool operator!=(const QQmlProfilerEventLocation &location1, return !(location1 == location2); } -inline uint qHash(const QQmlProfilerEventLocation &location) +inline size_t qHash(const QQmlProfilerEventLocation &location) { return qHash(location.filename()) ^ ((location.line() & 0xfff) // 12 bits of line number diff --git a/src/qmldebug/qqmlprofilereventtype_p.h b/src/qmldebug/qqmlprofilereventtype_p.h index 7189df53ef..c89115be83 100644 --- a/src/qmldebug/qqmlprofilereventtype_p.h +++ b/src/qmldebug/qqmlprofilereventtype_p.h @@ -97,7 +97,7 @@ private: QDataStream &operator>>(QDataStream &stream, QQmlProfilerEventType &type); QDataStream &operator<<(QDataStream &stream, const QQmlProfilerEventType &type); -inline uint qHash(const QQmlProfilerEventType &type) +inline size_t qHash(const QQmlProfilerEventType &type) { return qHash(type.location()) ^ (((type.message() << 12) & 0xf000) // 4 bits message |