whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix configure warnings on Windows 7 with MSVC2010. 

Change-Id: I5c4e27d6437cdf7b0dfd17df812d4506d1be4fb9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
bb10
Mitch Curtis 2013-09-19 15:03:05 +02:00 committed by The Qt Project
parent 7247cb9e4a
commit a1a00fc862
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/tools/qarraydata.cpp
View File

@ -91,7 +91,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) / int(objectSize);
capacity = qAllocMore(int(objectSize * capacity), int(headerSize)) / int(objectSize);
size_t allocSize = headerSize + objectSize * capacity;

2
tools/configure/configureapp.cpp
View File

@ -1543,7 +1543,7 @@ void Configure::desc(const char *option, const char *description, bool skipInden
if (!skipIndent)
printf("%*s", optionIndent, "");
int remaining = descIndent - optionIndent - strlen(option);
int remaining = descIndent - optionIndent - int(strlen(option));
int wrapIndent = descIndent + qMax(0, 1 - remaining);
printf("%s", option);

2
tools/configure/environment.cpp
View File

@ -347,7 +347,7 @@ int Environment::execute(QStringList arguments, const QStringList &additionalEnv
if (envStrings) {
int strLen = 0;
for (LPWSTR envString = envStrings; *(envString); envString += strLen + 1) {
strLen = wcslen(envString);
strLen = int(wcslen(envString));
QString str = QString((const QChar*)envString, strLen);
if (!str.startsWith("=")) { // These are added by the system
int sepIndex = str.indexOf('=');