Windows: Remove explicit usage of _WIN32_WINNT and WINVER macros

The are set in a central place, in the precompile header file.
Or as DEFAULT_DEFINES when the precompile header file is not used.

Change-Id: Ie020f916b64eabcd5a8153f4be5474986f5afed5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>

10 files changed, 27 insertions, 42 deletions

diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp
index 3e8e2ac3bc..8b79923c51 100644
--- a/src/libs/utils/fileutils.cpp
+++ b/src/libs/utils/fileutils.cpp
@@ -45,10 +45,6 @@
 #endif
 
 #ifdef Q_OS_WIN
-// We need defines for Windows 8
-#undef _WIN32_WINNT
-#define _WIN32_WINNT _WIN32_WINNT_WIN8
-
 #include <qt_windows.h>
 #include <shlobj.h>
 #endif
diff --git a/src/libs/utils/hostosinfo.cpp b/src/libs/utils/hostosinfo.cpp
index 8a3c0e814d..c5f313d5ce 100644
--- a/src/libs/utils/hostosinfo.cpp
+++ b/src/libs/utils/hostosinfo.cpp
@@ -32,8 +32,6 @@
 #endif
 
 #ifdef Q_OS_WIN
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0501 /* WinXP, needed for GetNativeSystemInfo() */
 #include <qt_windows.h>
 #endif
 
diff --git a/src/libs/utils/process_ctrlc_stub.cpp b/src/libs/utils/process_ctrlc_stub.cpp
index e5469e208d..951c135265 100644
--- a/src/libs/utils/process_ctrlc_stub.cpp
+++ b/src/libs/utils/process_ctrlc_stub.cpp
@@ -36,7 +36,10 @@
 #define _WIN32_WINNT 0x0501
 #endif
 
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif
+
 #include <windows.h>
 #include <shellapi.h>
 #include <wchar.h>
diff --git a/src/libs/utils/winutils.cpp b/src/libs/utils/winutils.cpp
index 69eb0d11e8..0f98d91ace 100644
--- a/src/libs/utils/winutils.cpp
+++ b/src/libs/utils/winutils.cpp
@@ -26,10 +26,7 @@
 #include "winutils.h"
 #include "qtcassert.h"
 
-// Enable WinAPI Windows Vista and later
 #ifdef Q_OS_WIN
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0600 // Needed for QueryFullProcessImageName
 #include <windows.h>
 #endif
 
diff --git a/src/plugins/debugger/procinterrupt.cpp b/src/plugins/debugger/procinterrupt.cpp
index 085747ea60..b9605e653a 100644
--- a/src/plugins/debugger/procinterrupt.cpp
+++ b/src/plugins/debugger/procinterrupt.cpp
@@ -40,10 +40,6 @@ static inline QString msgCannotInterrupt(qint64 pid, const QString &why)
 }
 
 #if defined(Q_OS_WIN)
-
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0501 /* WinXP, needed for DebugBreakProcess() */
-
 #include <utils/winutils.h>
 #include <windows.h>
 
diff --git a/src/plugins/debugger/registerpostmortemaction.cpp b/src/plugins/debugger/registerpostmortemaction.cpp
index be37504a70..477b04b354 100644
--- a/src/plugins/debugger/registerpostmortemaction.cpp
+++ b/src/plugins/debugger/registerpostmortemaction.cpp
@@ -23,10 +23,6 @@
 **
 ****************************************************************************/
 
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0400
-#endif
-
 #include "registerpostmortemaction.h"
 
 #include <registryaccess.h>
diff --git a/src/plugins/debugger/shared/hostutils.cpp b/src/plugins/debugger/shared/hostutils.cpp
index 5a65d5a6ea..326876fe5a 100644
--- a/src/plugins/debugger/shared/hostutils.cpp
+++ b/src/plugins/debugger/shared/hostutils.cpp
@@ -28,10 +28,6 @@
 #ifdef Q_OS_WIN
 
 #include <QTextStream>
-
-// Enable Win API of XP SP1 and later
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0502
 #include <windows.h>
 #include <utils/winutils.h>
 #include <tlhelp32.h>
diff --git a/src/plugins/projectexplorer/devicesupport/desktopprocesssignaloperation.cpp b/src/plugins/projectexplorer/devicesupport/desktopprocesssignaloperation.cpp
index e0ac77deca..b53d8dbeb7 100644
--- a/src/plugins/projectexplorer/devicesupport/desktopprocesssignaloperation.cpp
+++ b/src/plugins/projectexplorer/devicesupport/desktopprocesssignaloperation.cpp
@@ -36,7 +36,6 @@
 #include <QProcess>
 
 #ifdef Q_OS_WIN
-#define _WIN32_WINNT 0x0502
 #include <windows.h>
 #ifndef PROCESS_SUSPEND_RESUME
 #define PROCESS_SUSPEND_RESUME 0x0800
diff --git a/src/plugins/projectexplorer/devicesupport/localprocesslist.cpp b/src/plugins/projectexplorer/devicesupport/localprocesslist.cpp
index 24d692dd28..46249f1c24 100644
--- a/src/plugins/projectexplorer/devicesupport/localprocesslist.cpp
+++ b/src/plugins/projectexplorer/devicesupport/localprocesslist.cpp
@@ -40,9 +40,6 @@
 #endif
 
 #ifdef Q_OS_WIN
-// Enable Win API of XP SP1 and later
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0502
 #include <windows.h>
 #include <utils/winutils.h>
 #include <tlhelp32.h>
diff --git a/src/shared/qtcreator_pch.h b/src/shared/qtcreator_pch.h
index 4988f3d939..a7e1493b4d 100644
--- a/src/shared/qtcreator_pch.h
+++ b/src/shared/qtcreator_pch.h
@@ -31,24 +31,31 @@
 #if defined __cplusplus
 #include <QtGlobal>
 
-#ifdef Q_WS_WIN
-# define _POSIX_
-# include <limits.h>
-# undef _POSIX_
-#endif
+#ifdef Q_OS_WIN
+#undef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+
+// lib/Utils needs defines for Windows 8
+#undef WINVER
+#define WINVER 0x0602
+#undef _WIN32_WINNT
+#define _WIN32_WINNT 0x0602
+
+#define NOHELP
+#include <qt_windows.h>
+
+#undef DELETE
+#undef IN
+#undef OUT
+#undef ERROR
+#undef ABSOLUTE
+
+#define _POSIX_
+#include <limits.h>
+#undef _POSIX_
+#endif // Q_OS_WIN
 
-#include <QCoreApplication>
-#include <QList>
-#include <QVariant>
-#include <QObject>
-#include <QRegExp>
-#include <QString>
-#include <QStringList>
-#include <QTextCodec>
-#include <QPointer>
-#include <QScopedPointer>
-#include <QSharedPointer>
-#include <QDebug>
+#include <QtCore>
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 #include <QTextStream>