diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2021-12-13 13:51:25 +0300 |
|---|---|---|
| committer | Ivan Komissarov <abbapoh@gmail.com> | 2021-12-13 13:51:25 +0300 |
| commit | 119d6195adcd1bceb6eabb59062d54b639ca22a7 (patch) | |
| tree | 40db0335c122bd41205d0399a3a87091e56d8ccd /src/lib/corelib/tools/id.cpp | |
| parent | 8538cb992043eb680c1b7acaf133e4147e1db86a (diff) | |
| parent | 137e1f968935a583a18c6a9c567ad043aff91360 (diff) | |
Merge branch '1.21' into master
Change-Id: Ia540ffdfbcb1e51146dba53337defd09ded66f1a
Diffstat (limited to 'src/lib/corelib/tools/id.cpp')
| -rw-r--r-- | src/lib/corelib/tools/id.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/corelib/tools/id.cpp b/src/lib/corelib/tools/id.cpp index b4c791f75..cca755512 100644 --- a/src/lib/corelib/tools/id.cpp +++ b/src/lib/corelib/tools/id.cpp @@ -75,7 +75,7 @@ public: : n(length), str(s) { if (!n) - length = n = qstrlen(s); + length = n = int(qstrlen(s)); h = 0; while (length--) { h = (h << 4) + *s++; @@ -95,7 +95,7 @@ static bool operator==(const StringHolder &sh1, const StringHolder &sh2) } -static uint qHash(const StringHolder &sh) +QHashValueType qHash(const StringHolder &sh) { return sh.h; } |