diff options
author | Mitch Curtis <mitch.curtis@digia.com> | 2013-09-19 15:03:05 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-25 13:39:14 +0200 |
commit | a1a00fc8622379a2f1759d57995e8853a8dd7195 (patch) | |
tree | cb029d0d88cbf7402828c0a7d1819c4127f49634 /tools | |
parent | 7247cb9e4a8c91fd9b233a47fd2620aed3c7be43 (diff) |
Fix configure warnings on Windows 7 with MSVC2010.
Change-Id: I5c4e27d6437cdf7b0dfd17df812d4506d1be4fb9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/configure/configureapp.cpp | 2 | ||||
-rw-r--r-- | tools/configure/environment.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
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('='); |