diff options
author | Erik Verbruggen <erik.verbruggen@qt.io> | 2019-02-14 12:07:45 +0100 |
---|---|---|
committer | Erik Verbruggen <erik.verbruggen@qt.io> | 2019-02-14 11:30:28 +0000 |
commit | d96a700cc3611480ff76023287cb06f455a37b02 (patch) | |
tree | b8526d23bd90b23c5b05b0ebbeb45acaf08ab4ee /src/qml | |
parent | 8df1afa89558ddb608ff0df792d2015dd5e2e6ac (diff) |
V4: Fix failing assert on all 32bit platforms
The failing assert is in qv4mm.cpp:170, which is correct. The failure
stemms from the fact that on 32bit platforms, quint64 does not have the
same size as quintptr. Who would have thought?
Fixes: QTBUG-73821
Change-Id: I9abe6bc9e2bfcdb6700ab7997c078076a9883cf2
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml')
-rw-r--r-- | src/qml/memory/qv4mm.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/memory/qv4mm.cpp b/src/qml/memory/qv4mm.cpp index 3cf22d82e5..203f1f424f 100644 --- a/src/qml/memory/qv4mm.cpp +++ b/src/qml/memory/qv4mm.cpp @@ -201,7 +201,7 @@ Chunk *MemorySegment::allocate(size_t size) // chunk allocated for one huge allocation Q_ASSERT(availableBytes >= size); pageReservation.commit(base, size); - allocatedMap = ~static_cast<quintptr>(0); + allocatedMap = ~static_cast<quint64>(0); return base; } size_t requiredChunks = (size + sizeof(Chunk) - 1)/sizeof(Chunk); |