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 /qmake | |
| 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 'qmake')
| -rw-r--r-- | qmake/library/ioutils.cpp | 2 | ||||
| -rw-r--r-- | qmake/library/qmakebuiltins.cpp | 2 | ||||
| -rw-r--r-- | qmake/library/qmakeevaluator.cpp | 2 | ||||
| -rw-r--r-- | qmake/library/qmakeglobals.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/qmake/library/ioutils.cpp b/qmake/library/ioutils.cpp index 719d3b514a..c46eb7b663 100644 --- a/qmake/library/ioutils.cpp +++ b/qmake/library/ioutils.cpp @@ -33,7 +33,7 @@ #include <qregularexpression.h> #ifdef Q_OS_WIN -# include <windows.h> +# include <qt_windows.h> #else # include <sys/types.h> # include <sys/stat.h> diff --git a/qmake/library/qmakebuiltins.cpp b/qmake/library/qmakebuiltins.cpp index 7a77e995c4..5469a2ca7c 100644 --- a/qmake/library/qmakebuiltins.cpp +++ b/qmake/library/qmakebuiltins.cpp @@ -66,7 +66,7 @@ #include <sys/stat.h> #include <sys/utsname.h> #else -#include <windows.h> +#include <qt_windows.h> #endif #include <stdio.h> #include <stdlib.h> diff --git a/qmake/library/qmakeevaluator.cpp b/qmake/library/qmakeevaluator.cpp index 14d940b4b7..3b0ff8ee93 100644 --- a/qmake/library/qmakeevaluator.cpp +++ b/qmake/library/qmakeevaluator.cpp @@ -57,7 +57,7 @@ # include <sys/sysctl.h> # endif #else -#include <windows.h> +#include <qt_windows.h> #endif #include <stdio.h> #include <stdlib.h> diff --git a/qmake/library/qmakeglobals.cpp b/qmake/library/qmakeglobals.cpp index b4dab9ce8f..7d51b0f184 100644 --- a/qmake/library/qmakeglobals.cpp +++ b/qmake/library/qmakeglobals.cpp @@ -51,7 +51,7 @@ #include <unistd.h> #include <sys/utsname.h> #else -#include <windows.h> +#include <qt_windows.h> #endif #include <stdio.h> #include <stdlib.h> |