diff options
| author | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-05-23 15:51:02 +0200 |
|---|---|---|
| committer | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-06-06 15:55:08 +0000 |
| commit | 25eecddedb54a92dc6930b24015f6c1e8da6eeb5 (patch) | |
| tree | 2ca86af71b63533c5a08b1a5bb074199ca00c7e1 /src | |
| parent | bd214648bf077c87b81cb2d08b086cd258412dc1 (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: I2d8618f1f73e7edde941b21fad1a8528c998106b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/activeqt/control/qaxserverbase.cpp | 4 | ||||
| -rw-r--r-- | src/activeqt/shared/qaxtypes.cpp | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/src/activeqt/control/qaxserverbase.cpp b/src/activeqt/control/qaxserverbase.cpp index ff07664..d92b9b1 100644 --- a/src/activeqt/control/qaxserverbase.cpp +++ b/src/activeqt/control/qaxserverbase.cpp @@ -1,10 +1,6 @@ // Copyright (C) 2020 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -#ifndef NOMINMAX -# define NOMINMAX -#endif - #include <qabstracteventdispatcher.h> #include <qapplication.h> #include <qbuffer.h> diff --git a/src/activeqt/shared/qaxtypes.cpp b/src/activeqt/shared/qaxtypes.cpp index f4f367a..027511c 100644 --- a/src/activeqt/shared/qaxtypes.cpp +++ b/src/activeqt/shared/qaxtypes.cpp @@ -1,10 +1,6 @@ // Copyright (C) 2015 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -#ifndef NOMINMAX -# define NOMINMAX -#endif - #include <ocidl.h> #include <olectl.h> |