diff options
| author | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-05-23 15:52:12 +0200 |
|---|---|---|
| committer | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-06-06 07:24:51 +0000 |
| commit | 30ae5fa406cbcf0ef20c8b51759a301669fbd22a (patch) | |
| tree | baded555a90f66a2f66affe8f18966519c3ace39 /src/qmlworkerscript | |
| parent | e31821795e6e44db93e5fd27a18273ba9fba1af5 (diff) | |
Remove the manual undef of the min/max macros, or def NOMINMAX
We now add NOMINMAX to PlatformCommonInternal target which will be
linked to everything else, so min/max will not be defined upon the
inclusion of `windows.h`, or other headers.
Pick-to: 6.5 6.6
Change-Id: I3c71f2f719aad3fb83e189e33e5f176befcb4482
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/qmlworkerscript')
| -rw-r--r-- | src/qmlworkerscript/CMakeLists.txt | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/qmlworkerscript/CMakeLists.txt b/src/qmlworkerscript/CMakeLists.txt index 2bf6f205e2..3c6e53b839 100644 --- a/src/qmlworkerscript/CMakeLists.txt +++ b/src/qmlworkerscript/CMakeLists.txt @@ -57,11 +57,6 @@ qt_internal_add_qml_module(QmlWorkerScript GENERATE_PRIVATE_CPP_EXPORTS ) -qt_internal_extend_target(QmlWorkerScript CONDITION WIN32 - DEFINES - NOMINMAX -) - qt_internal_extend_target(QmlWorkerScript CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) DEFINES WTF_USE_UDIS86=1 |