diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-13 12:49:53 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-13 13:09:57 +0200 |
| commit | 07ffa04b917a55f48fd6fa27fd6b24260719742a (patch) | |
| tree | 194f798e097dfe3252de5b2ed49f45b1e98b8141 /src | |
| parent | 8eccd45958eb698c628c8771beef3c975b5ffb43 (diff) | |
| download | qtactiveqt-07ffa04b917a55f48fd6fa27fd6b24260719742a.tar.gz | |
Fix Windows build against qdatetime.h that uses min/max
Define NOMINMAX to prevent windows system header files from re-defining
min/max.
Change-Id: I6b392a8eeb89ba54da0bba1baf05165bc5ad2c91
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/activeqt/control/qaxserverbase.cpp | 1 | ||||
| -rw-r--r-- | src/activeqt/shared/qaxtypes.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/activeqt/control/qaxserverbase.cpp b/src/activeqt/control/qaxserverbase.cpp index 6df9189..e8cc8a8 100644 --- a/src/activeqt/control/qaxserverbase.cpp +++ b/src/activeqt/control/qaxserverbase.cpp @@ -39,6 +39,7 @@ ****************************************************************************/ #define QT_NO_CAST_TO_ASCII +#define NOMINMAX #ifndef QT_NO_WIN_ACTIVEQT diff --git a/src/activeqt/shared/qaxtypes.cpp b/src/activeqt/shared/qaxtypes.cpp index 8f63f0c..bcd8380 100644 --- a/src/activeqt/shared/qaxtypes.cpp +++ b/src/activeqt/shared/qaxtypes.cpp @@ -38,6 +38,8 @@ ** ****************************************************************************/ +#define NOMINMAX + #include <ocidl.h> #include <olectl.h> |