From 0711bb704ef5cdd20d5079418c256e3502258613 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@trolltech.com>
Date: Tue, 13 Apr 2010 17:35:04 +0200
Subject: Revert "Removed double setting of _WIN32_WINNT"

This reverts commit a165d1cfbb15ced6079a0d752fbdb37a478ff46f.

Was causing an error: (msvc2005)
qthread_win.cpp(369) : error C3861: 'SwitchToThread': identifier not found
---
 src/corelib/thread/qthread_win.cpp |  6 ++++++
 src/gui/dialogs/qwizard_win.cpp    | 14 ++++++++++----
 src/gui/styles/qwindowsxpstyle_p.h | 13 +++++++++----
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/corelib/thread/qthread_win.cpp b/src/corelib/thread/qthread_win.cpp
index 505a9d6..37d5b87 100644
--- a/src/corelib/thread/qthread_win.cpp
+++ b/src/corelib/thread/qthread_win.cpp
@@ -39,6 +39,12 @@
 **
 ****************************************************************************/
 
+//#define WINVER 0x0500
+#if _WIN32_WINNT < 0x0400
+#define _WIN32_WINNT 0x0400
+#endif
+
+
 #include "qthread.h"
 #include "qthread_p.h"
 #include "qthreadstorage.h"
diff --git a/src/gui/dialogs/qwizard_win.cpp b/src/gui/dialogs/qwizard_win.cpp
index ff13585..1390b21 100644
--- a/src/gui/dialogs/qwizard_win.cpp
+++ b/src/gui/dialogs/qwizard_win.cpp
@@ -51,11 +51,17 @@
 #include <QtGui/QDesktopWidget>
 
 // Note, these tests are duplicates in qwindowsxpstyle_p.h.
-// minimum version for Windows XP is 0x501
-#if _WIN32_WINNT < 0x0501
-#  undef _WIN32_WINNT
-#  define _WIN32_WINNT 0x0501
+#ifdef Q_CC_GNU
+#  include <w32api.h>
+#  if (__W32API_MAJOR_VERSION >= 3 || (__W32API_MAJOR_VERSION == 2 && __W32API_MINOR_VERSION >= 5))
+#    ifdef _WIN32_WINNT
+#      undef _WIN32_WINNT
+#    endif
+#    define _WIN32_WINNT 0x0501
+#    include <commctrl.h>
+#  endif
 #endif
+
 #include <uxtheme.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/styles/qwindowsxpstyle_p.h b/src/gui/styles/qwindowsxpstyle_p.h
index 4e8aa00..0a13a52 100644
--- a/src/gui/styles/qwindowsxpstyle_p.h
+++ b/src/gui/styles/qwindowsxpstyle_p.h
@@ -59,10 +59,15 @@
 #include <qt_windows.h>
 
 // Note, these tests are duplicated in qwizard_win.cpp.
-// minimum version for Windows XP is 0x501
-#if _WIN32_WINNT < 0x0501
-#  undef _WIN32_WINNT
-#  define _WIN32_WINNT 0x0501
+#ifdef Q_CC_GNU
+#  include <w32api.h>
+#  if (__W32API_MAJOR_VERSION >= 3 || (__W32API_MAJOR_VERSION == 2 && __W32API_MINOR_VERSION >= 5))
+#    ifdef _WIN32_WINNT
+#      undef _WIN32_WINNT
+#    endif
+#    define _WIN32_WINNT 0x0501
+#    include <commctrl.h>
+#  endif
 #endif
 
 #include <uxtheme.h>
-- 
cgit v0.12