diff options
| author | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-05-23 15:04:17 +0200 |
|---|---|---|
| committer | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-06-08 01:18:04 +0200 |
| commit | 1dfa922606e497918e57a6a06f96ee63b7fb163e (patch) | |
| tree | 37058b862a9ba496f3330aba57183123ba132ea2 /tests/auto/network/socket/qtcpsocket | |
| parent | 076b4bed9f418f97f9fb29fce4f948f0d98854c1 (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: I10016720dac7ce015e929885b7368ee86d8b6918
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tests/auto/network/socket/qtcpsocket')
| -rw-r--r-- | tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp index 5dc12b924f..c16717e95a 100644 --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp @@ -4,8 +4,6 @@ #include <qglobal.h> -// To prevent windows system header files from re-defining min/max -#define NOMINMAX 1 #if defined(_WIN32) #include <winsock2.h> #else |