diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2021-10-25 12:09:52 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2021-10-25 20:10:59 +0200 |
| commit | 5aa0a4f722b46f90d42c61480da30ac2e3405755 (patch) | |
| tree | 97d0421f635b7240e268ea8c8688484c1cfd4880 /src/qml/jsruntime | |
| parent | 9ec55bb0c7df7c6edbcbdca4669594fffaef16f3 (diff) | |
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>
Diffstat (limited to 'src/qml/jsruntime')
| -rw-r--r-- | src/qml/jsruntime/qv4dateobject.cpp | 2 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4errorobject.cpp | 2 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4functiontable_win64.cpp | 2 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4stringobject.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
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; |