Use qt_windows.h.

Fixes NOMINMAX and mingw missing _WIN32_WINNT define.

Change-Id: I28ea6f328b495033d484fa07181062dc92f0855f
Reviewed-by: Niels Weber <niels.weber@digia.com>

8 files changed, 9 insertions, 47 deletions

diff --git a/src/libs/installer/adminauthorization_win.cpp b/src/libs/installer/adminauthorization_win.cpp
index 03003b21a..528f3403d 100644
--- a/src/libs/installer/adminauthorization_win.cpp
+++ b/src/libs/installer/adminauthorization_win.cpp
@@ -45,17 +45,14 @@
 #include <QDebug>
 #include <QDir>
 
+#include <qt_windows.h>
+
 #ifdef Q_CC_MINGW
-# ifndef _WIN32_WINNT
-#  define _WIN32_WINNT 0x0501
-# endif
 # ifndef SEE_MASK_NOASYNC
 #  define SEE_MASK_NOASYNC 0x00000100
 # endif
 #endif
 
-#include <windows.h>
-
 struct DeCoInitializer
 {
     DeCoInitializer()
diff --git a/src/libs/installer/createshortcutoperation.cpp b/src/libs/installer/createshortcutoperation.cpp
index 963f0aaf8..8c5917852 100644
--- a/src/libs/installer/createshortcutoperation.cpp
+++ b/src/libs/installer/createshortcutoperation.cpp
@@ -52,12 +52,7 @@
 using namespace QInstaller;
 
 #ifdef Q_OS_WIN
-#ifdef Q_CC_MINGW
-# ifndef _WIN32_WINNT
-#  define _WIN32_WINNT 0x0501
-# endif
-#endif
-#include <windows.h>
+#include <qt_windows.h>
 #include <shlobj.h>
 
 #ifndef PIDLIST_ABSOLUTE
diff --git a/src/libs/installer/fileutils.cpp b/src/libs/installer/fileutils.cpp
index e499fd100..fe10277ea 100644
--- a/src/libs/installer/fileutils.cpp
+++ b/src/libs/installer/fileutils.cpp
@@ -521,13 +521,7 @@ QString QInstaller::createTemporaryDirectory(const QString &templateName)
 }
 
 #ifdef Q_OS_WIN
-# ifdef Q_CC_MINGW
-#  ifndef _WIN32_WINNT
-#   define _WIN32_WINNT 0x0501
-#  endif
-# endif
-#include <windows.h>
-
+#include <qt_windows.h>
 
 QString QInstaller::getShortPathName(const QString &name)
 {
diff --git a/src/libs/installer/link.cpp b/src/libs/installer/link.cpp
index f8b872f33..d7588d077 100644
--- a/src/libs/installer/link.cpp
+++ b/src/libs/installer/link.cpp
@@ -50,13 +50,7 @@
 #endif
 
 #ifdef Q_OS_WIN
-#ifdef Q_CC_MINGW
-# ifndef _WIN32_WINNT
-#  define _WIN32_WINNT 0x0501
-# endif
-#endif
-
-#include <windows.h>
+#include <qt_windows.h>
 #include <winioctl.h>
 
 #ifndef Q_CC_MINGW
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index 5416bc9f2..782d3c574 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -78,7 +78,7 @@
 #include <errno.h>
 
 #ifdef Q_OS_WIN
-#include <windows.h>
+#include <qt_windows.h>
 #endif
 
 namespace QInstaller {
diff --git a/src/libs/installer/sysinfo_win.cpp b/src/libs/installer/sysinfo_win.cpp
index 618d6cfdb..8e02b9e70 100644
--- a/src/libs/installer/sysinfo_win.cpp
+++ b/src/libs/installer/sysinfo_win.cpp
@@ -40,19 +40,11 @@
 **************************************************************************/
 
 #include "kdsysinfo.h"
-
 #include "link.h"
 
-#ifdef Q_CC_MINGW
-# ifndef _WIN32_WINNT
-#  define _WIN32_WINNT 0x0501
-# endif
-#endif
-
-#include <windows.h>
+#include <qt_windows.h>
 #include <psapi.h>
 #include <tlhelp32.h>
-
 #include <winnetwk.h>
 
 #ifndef Q_CC_MINGW
diff --git a/src/libs/installer/utils.cpp b/src/libs/installer/utils.cpp
index 2b5491f62..469ba5980 100644
--- a/src/libs/installer/utils.cpp
+++ b/src/libs/installer/utils.cpp
@@ -47,7 +47,7 @@
 #include <QtCore/QVector>
 #include <QCoreApplication>
 
-#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE)
+#if defined(Q_OS_WIN) || defined(Q_OS_WINCE)
 #   include "qt_windows.h"
 #endif
 
@@ -55,10 +55,6 @@
 #include <iostream>
 #include <sstream>
 
-
-#ifdef Q_OS_WIN
-#include <windows.h> // for Sleep
-#endif
 #ifdef Q_OS_UNIX
 #include <errno.h>
 #include <signal.h>
diff --git a/src/libs/kdtools/kdsysinfo_win.cpp b/src/libs/kdtools/kdsysinfo_win.cpp
index edeeb6879..cc28b35d2 100644
--- a/src/libs/kdtools/kdsysinfo_win.cpp
+++ b/src/libs/kdtools/kdsysinfo_win.cpp
@@ -44,13 +44,7 @@
 #include <QLibrary>
 #include <QStringList>
 
-#ifdef Q_CC_MINGW
-# ifndef _WIN32_WINNT
-#  define _WIN32_WINNT 0x0501
-# endif
-#endif
-
-#include <windows.h>
+#include <qt_windows.h>
 #include <psapi.h>
 #include <tlhelp32.h>