From e01c25e85962dcb12cd6faae4c07d62a84c39e6f Mon Sep 17 00:00:00 2001
From: Yuhang Zhao <2546789017@qq.com>
Date: Fri, 19 Nov 2021 13:05:38 +0800
Subject: QtBase: replace windows.h with qt_windows.h

We have some special handling in qt_windows.h,
use it instead of the original windows.h

Change-Id: I12fa45b09d3f2aad355573dce45861d7d28e1d77
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
---
 tests/benchmarks/corelib/io/qdir/10000/tst_bench_qdir_10000.cpp  | 2 +-
 tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp | 2 +-
 tests/benchmarks/corelib/io/qfile/tst_bench_qfile.cpp            | 2 +-
 tests/benchmarks/corelib/thread/qmutex/tst_bench_qmutex.cpp      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'tests/benchmarks/corelib')

diff --git a/tests/benchmarks/corelib/io/qdir/10000/tst_bench_qdir_10000.cpp b/tests/benchmarks/corelib/io/qdir/10000/tst_bench_qdir_10000.cpp
index 4ed1246a6c..b22c15b07f 100644
--- a/tests/benchmarks/corelib/io/qdir/10000/tst_bench_qdir_10000.cpp
+++ b/tests/benchmarks/corelib/io/qdir/10000/tst_bench_qdir_10000.cpp
@@ -30,7 +30,7 @@
 #include <QDirIterator>
 
 #ifdef Q_OS_WIN
-#   include <windows.h>
+#   include <qt_windows.h>
 #else
 #   include <sys/stat.h>
 #   include <sys/types.h>
diff --git a/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp b/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp
index 10b1b90ce2..fe68d9164d 100644
--- a/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp
+++ b/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp
@@ -85,7 +85,7 @@
 #include <qplatformdefs.h>
 
 #ifdef Q_OS_WIN
-#   include <windows.h>
+#   include <qt_windows.h>
 #else
 #   include <sys/stat.h>
 #   include <sys/types.h>
diff --git a/tests/benchmarks/corelib/io/qfile/tst_bench_qfile.cpp b/tests/benchmarks/corelib/io/qfile/tst_bench_qfile.cpp
index e7026c70f9..cbe0bf81c9 100644
--- a/tests/benchmarks/corelib/io/qfile/tst_bench_qfile.cpp
+++ b/tests/benchmarks/corelib/io/qfile/tst_bench_qfile.cpp
@@ -38,7 +38,7 @@
 #include <stdio.h>
 
 #ifdef Q_OS_WIN
-# include <windows.h>
+# include <qt_windows.h>
 #endif
 
 #if defined(Q_OS_QNX) && defined(open)
diff --git a/tests/benchmarks/corelib/thread/qmutex/tst_bench_qmutex.cpp b/tests/benchmarks/corelib/thread/qmutex/tst_bench_qmutex.cpp
index 1091ef3251..2042aa4885 100644
--- a/tests/benchmarks/corelib/thread/qmutex/tst_bench_qmutex.cpp
+++ b/tests/benchmarks/corelib/thread/qmutex/tst_bench_qmutex.cpp
@@ -79,7 +79,7 @@ void NativeMutexUnlock(NativeMutexType *mutex)
 #  if !defined(_WIN32_WINNT)
 #    define _WIN32_WINNT 0x0A00
 #  endif
-#  include <windows.h>
+#  include <qt_windows.h>
 typedef CRITICAL_SECTION NativeMutexType;
 void NativeMutexInitialize(NativeMutexType *mutex)
 {
-- 
cgit v1.2.3