diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-05-21 08:27:26 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-05-21 09:32:58 +0200 |
| commit | bd8ea10cf6bb4532931fd733cbf35a5c33fb6189 (patch) | |
| tree | c5fb72ad21d492db16cc3ec530550127dc013768 /src | |
| parent | 943dba8f54b75b32eb513c6a703607bd593029c4 (diff) | |
Fix compile error due to redefinition of NOMINMAX (MinGW)
Amends qtactiveqt/81139fb65dd2dd2713029c0fea3b42d0c7bbad79 .
Pick-to: 6.1
Fixes: QTBUG-93944
Change-Id: I687d95659fbcbd38df38976fae98c2a9c615c4a6
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
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, 6 insertions, 2 deletions
diff --git a/src/activeqt/control/qaxserverbase.cpp b/src/activeqt/control/qaxserverbase.cpp index b877419..d80a84a 100644 --- a/src/activeqt/control/qaxserverbase.cpp +++ b/src/activeqt/control/qaxserverbase.cpp @@ -48,7 +48,9 @@ ** ****************************************************************************/ -#define NOMINMAX +#ifndef NOMINMAX +# define NOMINMAX +#endif #include <qabstracteventdispatcher.h> #include <qapplication.h> diff --git a/src/activeqt/shared/qaxtypes.cpp b/src/activeqt/shared/qaxtypes.cpp index d243f3d..fa74c7b 100644 --- a/src/activeqt/shared/qaxtypes.cpp +++ b/src/activeqt/shared/qaxtypes.cpp @@ -48,7 +48,9 @@ ** ****************************************************************************/ -#define NOMINMAX +#ifndef NOMINMAX +# define NOMINMAX +#endif #include <ocidl.h> #include <olectl.h> |