Replace all includes of windows.h with qt_windows.h

We don't want min and max to be macros.

Change-Id: Ifa79eaecf00c9f8b9c61494aa9d883eebfdabc65
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

10 files changed, 10 insertions, 10 deletions

diff --git a/src/3rdparty/masm/stubs/ExecutableAllocator.h b/src/3rdparty/masm/stubs/ExecutableAllocator.h
index 515285a7dc..9ab19871c7 100644
--- a/src/3rdparty/masm/stubs/ExecutableAllocator.h
+++ b/src/3rdparty/masm/stubs/ExecutableAllocator.h
@@ -50,7 +50,7 @@
 #endif
 
 #if OS(WINDOWS)
-#include <windows.h>
+#include <qt_windows.h>
 #else
 #include <sys/mman.h>
 #include <unistd.h>
diff --git a/src/3rdparty/masm/wtf/Assertions.h b/src/3rdparty/masm/wtf/Assertions.h
index be25d43826..bb0fef7ff0 100644
--- a/src/3rdparty/masm/wtf/Assertions.h
+++ b/src/3rdparty/masm/wtf/Assertions.h
@@ -215,7 +215,7 @@ WTF_EXPORT_PRIVATE void WTFInstallReportBacktraceOnCrashHook();
 
 #if OS(WINCE)
 /* FIXME: We include this here only to avoid a conflict with the ASSERT macro. */
-#include <windows.h>
+#include <qt_windows.h>
 #undef min
 #undef max
 #undef ERROR
diff --git a/src/3rdparty/masm/wtf/Atomics.h b/src/3rdparty/masm/wtf/Atomics.h
index df5abec81d..ccd60eb2a9 100644
--- a/src/3rdparty/masm/wtf/Atomics.h
+++ b/src/3rdparty/masm/wtf/Atomics.h
@@ -64,7 +64,7 @@
 #include <wtf/UnusedParam.h>
 
 #if OS(WINDOWS)
-#include <windows.h>
+#include <qt_windows.h>
 #elif OS(QNX)
 #include <atomic.h>
 #endif
diff --git a/src/3rdparty/masm/wtf/PageAllocation.h b/src/3rdparty/masm/wtf/PageAllocation.h
index db4e230e03..4345d05c5a 100644
--- a/src/3rdparty/masm/wtf/PageAllocation.h
+++ b/src/3rdparty/masm/wtf/PageAllocation.h
@@ -40,7 +40,7 @@
 
 #if OS(WINDOWS)
 #include <malloc.h>
-#include <windows.h>
+#include <qt_windows.h>
 #endif
 
 #if HAVE(ERRNO_H)
diff --git a/src/3rdparty/masm/wtf/PageBlock.cpp b/src/3rdparty/masm/wtf/PageBlock.cpp
index bc0e8d6f2d..28d4239c5a 100644
--- a/src/3rdparty/masm/wtf/PageBlock.cpp
+++ b/src/3rdparty/masm/wtf/PageBlock.cpp
@@ -32,7 +32,7 @@
 
 #if OS(WINDOWS)
 #include <malloc.h>
-#include <windows.h>
+#include <qt_windows.h>
 #endif
 
 namespace WTF {
diff --git a/src/qml/jsruntime/qv4dateobject.cpp b/src/qml/jsruntime/qv4dateobject.cpp
index 3b8c95009a..492312090d 100644
--- a/src/qml/jsruntime/qv4dateobject.cpp
+++ b/src/qml/jsruntime/qv4dateobject.cpp
@@ -95,7 +95,7 @@
 // QDateTime already included above
 #else
 #  ifdef Q_OS_WIN
-#    include <windows.h>
+#    include <qt_windows.h>
 #  else
 #    ifndef Q_OS_VXWORKS
 #      include <sys/time.h>
diff --git a/src/qml/jsruntime/qv4errorobject.cpp b/src/qml/jsruntime/qv4errorobject.cpp
index 525d3458f4..6d5dc7c332 100644
--- a/src/qml/jsruntime/qv4errorobject.cpp
+++ b/src/qml/jsruntime/qv4errorobject.cpp
@@ -57,7 +57,7 @@
 #    include "qplatformdefs.h"
 #  endif
 #else
-#  include <windows.h>
+#  include <qt_windows.h>
 #endif
 
 using namespace QV4;
diff --git a/src/qml/jsruntime/qv4functiontable_win64.cpp b/src/qml/jsruntime/qv4functiontable_win64.cpp
index 0cb98641cd..9705997e1b 100644
--- a/src/qml/jsruntime/qv4functiontable_win64.cpp
+++ b/src/qml/jsruntime/qv4functiontable_win64.cpp
@@ -43,7 +43,7 @@
 
 #include <QtCore/qdebug.h>
 
-#include <windows.h>
+#include <qt_windows.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qml/jsruntime/qv4stringobject.cpp b/src/qml/jsruntime/qv4stringobject.cpp
index 1d1a5b5814..0bd4f9fa31 100644
--- a/src/qml/jsruntime/qv4stringobject.cpp
+++ b/src/qml/jsruntime/qv4stringobject.cpp
@@ -62,7 +62,7 @@
 #    include "qplatformdefs.h"
 #  endif
 #else
-#  include <windows.h>
+#  include <qt_windows.h>
 #endif
 
 using namespace QV4;
diff --git a/tests/auto/qml/qv4assembler/tst_qv4assembler.cpp b/tests/auto/qml/qv4assembler/tst_qv4assembler.cpp
index de33a43707..7c75aab180 100644
--- a/tests/auto/qml/qv4assembler/tst_qv4assembler.cpp
+++ b/tests/auto/qml/qv4assembler/tst_qv4assembler.cpp
@@ -38,7 +38,7 @@
 #include <private/qv4global_p.h>
 
 #ifdef Q_OS_WIN
-#include <windows.h>
+#include <qt_windows.h>
 #endif
 
 class tst_QV4Assembler : public QQmlDataTest