diff options
| author | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-05-23 15:51:51 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-06-06 09:10:33 +0000 |
| commit | 6b928d5f81a2b2b4bd64b5f0a7975ffac8b44d2a (patch) | |
| tree | 036f86322529a0159f523532d9543aa22918dfad | |
| parent | 8f4629814f3df83e9ea85aebefb0e0c9929be476 (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.
Change-Id: I5d08d8c60e8dc3cb007d67e415f06b0b9f7112b9
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
(cherry picked from commit dffdbfee0ca6880bbc7e116342f0f29a67f5453a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/charts/qchartglobal.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/charts/qchartglobal.h b/src/charts/qchartglobal.h index d1bdc550..b18cd678 100644 --- a/src/charts/qchartglobal.h +++ b/src/charts/qchartglobal.h @@ -24,13 +24,4 @@ */ #define QT_CHARTS_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch)) -/* - On Windows min and max conflict with standard macros -*/ -#ifdef Q_OS_WIN -#ifndef NOMINMAX -#define NOMINMAX -#endif -#endif - #endif // QCHARTGLOBAL_H |