diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-09-17 09:54:58 +0200 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-09-17 11:23:00 +0200 |
| commit | f1d37d999bf4088b430c7a42c78ddb5ec827a916 (patch) | |
| tree | aa2ad84719211f09cb8266bfa6fcb0a92416d805 /src/qml/jsruntime | |
| parent | 8ca9191580e218e5359c6703a42ae9595e4aca1f (diff) | |
Match new qHash() signature
As documented in Qt 6 porting guide, qHash() should now also
accept a size_t as seed in addition to returning it.
Change-Id: I2b3ea26f631203468c071fa6ff65f95d82566132
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qml/jsruntime')
| -rw-r--r-- | src/qml/jsruntime/qv4jsonobject_p.h | 2 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4regexp_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4jsonobject_p.h b/src/qml/jsruntime/qv4jsonobject_p.h index 7b225fb1b6..9143286975 100644 --- a/src/qml/jsruntime/qv4jsonobject_p.h +++ b/src/qml/jsruntime/qv4jsonobject_p.h @@ -77,7 +77,7 @@ struct ObjectItem { inline bool operator ==(const ObjectItem &a, const ObjectItem &b) { return a.o->d() == b.o->d(); } -inline size_t qHash(const ObjectItem &i, uint seed = 0) +inline size_t qHash(const ObjectItem &i, size_t seed = 0) { return ::qHash((void *)i.o->d(), seed); } struct JsonObject : Object { diff --git a/src/qml/jsruntime/qv4regexp_p.h b/src/qml/jsruntime/qv4regexp_p.h index 9e78ed4175..ff6cc061ee 100644 --- a/src/qml/jsruntime/qv4regexp_p.h +++ b/src/qml/jsruntime/qv4regexp_p.h @@ -164,7 +164,7 @@ inline RegExpCacheKey::RegExpCacheKey(const RegExp::Data *re) , flags(re->flags) {} -inline size_t qHash(const RegExpCacheKey& key, uint seed = 0) Q_DECL_NOTHROW +inline size_t qHash(const RegExpCacheKey& key, size_t seed = 0) Q_DECL_NOTHROW { return qHash(key.pattern, seed); } class RegExpCache : public QHash<RegExpCacheKey, WeakValue> |