diff options
author | Yuhang Zhao <2546789017@qq.com> | 2021-11-19 13:05:38 +0800 |
---|---|---|
committer | Yuhang Zhao <2546789017@qq.com> | 2021-11-23 12:53:46 +0800 |
commit | e01c25e85962dcb12cd6faae4c07d62a84c39e6f (patch) | |
tree | 3bf5f20608b617526b73a5ebc69ab9fc16b605dd /tests/auto/corelib/io | |
parent | 4c7759cae28493f492308d9e91ab5399fab89416 (diff) |
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>
Diffstat (limited to 'tests/auto/corelib/io')
4 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp b/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp index 1fe47f196a..8b61025cc0 100644 --- a/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp +++ b/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp @@ -38,7 +38,7 @@ #include <QTimer> #include <QTemporaryFile> #if defined(Q_OS_WIN) -#include <windows.h> +#include <qt_windows.h> #endif #ifdef Q_OS_ANDROID diff --git a/tests/auto/corelib/io/qsavefile/tst_qsavefile.cpp b/tests/auto/corelib/io/qsavefile/tst_qsavefile.cpp index ad4bcb3cf5..3d09ea291d 100644 --- a/tests/auto/corelib/io/qsavefile/tst_qsavefile.cpp +++ b/tests/auto/corelib/io/qsavefile/tst_qsavefile.cpp @@ -40,7 +40,7 @@ #endif #if defined(Q_OS_WIN) -# include <windows.h> +# include <qt_windows.h> #endif #ifdef Q_OS_INTEGRITY diff --git a/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp b/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp index ea08ef0e65..d4760c0afd 100644 --- a/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp +++ b/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp @@ -38,7 +38,7 @@ #include <QtTest/private/qtesthelpers_p.h> #ifdef Q_OS_WIN # include <shlwapi.h> -# include <windows.h> +# include <qt_windows.h> #endif #ifdef Q_OS_UNIX // for geteuid() # include <sys/types.h> diff --git a/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp b/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp index e19443e1f5..732b2fa4a8 100644 --- a/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp +++ b/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp @@ -41,7 +41,7 @@ #if defined(Q_OS_WIN) # include <shlwapi.h> -# include <windows.h> +# include <qt_windows.h> #endif #if defined(Q_OS_UNIX) # include <sys/types.h> |