From 36ebe35e25ad44ff34f94a9a80245e5b3085691a Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Mon, 1 Nov 2010 09:12:56 +0100
Subject: [PATCH] Winutils: define Windows version correctly. Fix gcc warning.

---
 src/libs/utils/winutils.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/libs/utils/winutils.cpp b/src/libs/utils/winutils.cpp
index 60511ba963a..22fff734d0e 100644
--- a/src/libs/utils/winutils.cpp
+++ b/src/libs/utils/winutils.cpp
@@ -28,6 +28,9 @@
 **************************************************************************/
 
 #include "winutils.h"
+
+// Enable WinAPI Windows XP and later
+#define _WIN32_WINNT 0x0501
 #include <windows.h>
 
 #include <QtCore/QString>
@@ -105,8 +108,9 @@ QTCREATOR_UTILS_EXPORT QString winGetDLLVersion(WinDLLVersionType t,
         return QString();
     }
     VS_FIXEDFILEINFO  *versionInfo;
+    const LPCWSTR backslash = TEXT("\\");
     UINT len = 0;
-    if (!(*verQueryValueW)(data, TEXT("\\"), &versionInfo, &len)) {
+    if (!(*verQueryValueW)(data, const_cast<LPWSTR>(backslash), &versionInfo, &len)) {
         *errorMessage = QString::fromLatin1("Unable to determine version string of %1: %2").arg(name, winErrorMessage(GetLastError()));
         return QString();
     }
@@ -163,15 +167,10 @@ QTCREATOR_UTILS_EXPORT unsigned long winQPidToPid(const Q_PID qpid)
 
 QTCREATOR_UTILS_EXPORT bool winIs64BitSystem()
 {
- // Exclude VS 2005
-#if defined(_MSC_VER) && _MSC_VER < 1400
-    return false;
-#else
     SYSTEM_INFO systemInfo;
     GetNativeSystemInfo(&systemInfo);
     return systemInfo.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64
             || systemInfo.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_IA64;
-#endif
 }
 
 } // namespace Utils