diff options
-rw-r--r-- | src/corelib/tools/qarraydata.cpp | 2 | ||||
-rw-r--r-- | tools/configure/configureapp.cpp | 2 | ||||
-rw-r--r-- | tools/configure/environment.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/tools/qarraydata.cpp b/src/corelib/tools/qarraydata.cpp index a61147ad9c..825b3289c7 100644 --- a/src/corelib/tools/qarraydata.cpp +++ b/src/corelib/tools/qarraydata.cpp @@ -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; diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 576eca5bb9..914e7c9bfd 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -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); diff --git a/tools/configure/environment.cpp b/tools/configure/environment.cpp index d733165271..81769aa043 100644 --- a/tools/configure/environment.cpp +++ b/tools/configure/environment.cpp @@ -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('='); |