diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-02-15 10:19:32 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-02-15 10:23:15 +0000 |
| commit | a5389f3189f70177407dfd67d8b1d43e7a6b580b (patch) | |
| tree | da09a398c67d04e3db82758e8c4014321d686956 /src/qml/memory/qv4mm.cpp | |
| parent | 72ccc49e66ff2edebd758efa27facca034bff10d (diff) | |
QtQml/qv4mm.cpp: Fix type of debug helper lastAllocRequestedSlots
Fix MSVC 64 developer build:
memory\qv4mm.cpp(653): error C2220: warning treated as error - no 'object' file generated
memory\qv4mm.cpp(653): warning C4267: '=': conversion from 'size_t' to 'int', possible loss of data
memory\qv4mm.cpp(689): warning C4267: '=': conversion from 'size_t' to 'int', possible loss of data
Change-Id: Ia8c28e960027877eb4d45f12db7406902e755c03
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/memory/qv4mm.cpp')
| -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 1609dd5adb..5356b0d591 100644 --- a/src/qml/memory/qv4mm.cpp +++ b/src/qml/memory/qv4mm.cpp @@ -643,7 +643,7 @@ MemoryManager::MemoryManager(ExecutionEngine *engine) } #ifndef QT_NO_DEBUG -static int lastAllocRequestedSlots = 0; +static size_t lastAllocRequestedSlots = 0; #endif Heap::Base *MemoryManager::allocString(std::size_t unmanagedSize) |