From 6331894524911f28f7b29333e3e5cdbcca5b5e8f Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 17 Apr 2012 17:26:29 +0200 Subject: Fix MSVC conversion warnings in new bytearray code. Change-Id: Ifc81564daf3fef0d7f08ae8d250ba41d3b1d5b0f Reviewed-by: Thiago Macieira Reviewed-by: Friedemann Kleint --- src/corelib/tools/qarraydata.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/corelib/tools/qarraydata.cpp') diff --git a/src/corelib/tools/qarraydata.cpp b/src/corelib/tools/qarraydata.cpp index f1b88d50514..328d39cde9f 100644 --- a/src/corelib/tools/qarraydata.cpp +++ b/src/corelib/tools/qarraydata.cpp @@ -82,7 +82,7 @@ QArrayData *QArrayData::allocate(size_t objectSize, size_t alignment, // Allocate additional space if array is growing if (options & Grow) - capacity = qAllocMore(objectSize * capacity, headerSize) / objectSize; + capacity = qAllocMore(objectSize * capacity, headerSize) / int(objectSize); size_t allocSize = headerSize + objectSize * capacity; -- cgit v1.2.3