diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-13 12:13:36 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-13 12:19:17 +0200 |
| commit | 40a95ed42c34a4bdcd89c768a965c603714c5108 (patch) | |
| tree | 193e486a919f32e4f2ed631ec24fd8d5200846ef /src | |
| parent | d1b0862ad4d1dc64d8707464fb891ec397dc4b4a (diff) | |
Fix build on Windows with new qdatetime.h that doesn't redefine min/max
Windows system header files redefine min/max, unless NOMINMAX is defined.
In some cases we can simply include qt_windows.h, which does the trick,
in other cases including qt_windows.h produces different compilation
errors and it's simpler to just do the NOMINMAX trick.
Change-Id: I3cf81bab7c239363adfa274f158bdf999d1d3ecd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/multimedia/audio/qaudioinput_win32_p.h | 2 | ||||
| -rw-r--r-- | src/multimedia/audio/qaudiooutput_win32_p.h | 2 | ||||
| -rw-r--r-- | src/plugins/directshow/player/directshoweventloop.h | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/multimedia/audio/qaudioinput_win32_p.h b/src/multimedia/audio/qaudioinput_win32_p.h index ef603b1f7..1c9c7fab8 100644 --- a/src/multimedia/audio/qaudioinput_win32_p.h +++ b/src/multimedia/audio/qaudioinput_win32_p.h @@ -53,6 +53,8 @@ #ifndef QAUDIOINPUTWIN_H #define QAUDIOINPUTWIN_H +#define NOMINMAX + #include <windows.h> #include <mmsystem.h> diff --git a/src/multimedia/audio/qaudiooutput_win32_p.h b/src/multimedia/audio/qaudiooutput_win32_p.h index a7116294a..a5a4852de 100644 --- a/src/multimedia/audio/qaudiooutput_win32_p.h +++ b/src/multimedia/audio/qaudiooutput_win32_p.h @@ -53,6 +53,8 @@ #ifndef QAUDIOOUTPUTWIN_H #define QAUDIOOUTPUTWIN_H +#define NOMINMAX + #include <windows.h> #include <mmsystem.h> diff --git a/src/plugins/directshow/player/directshoweventloop.h b/src/plugins/directshow/player/directshoweventloop.h index cf04b874f..9dac09165 100644 --- a/src/plugins/directshow/player/directshoweventloop.h +++ b/src/plugins/directshow/player/directshoweventloop.h @@ -46,7 +46,7 @@ #include <QtCore/qobject.h> #include <QtCore/qwaitcondition.h> -#include <windows.h> +#include <qt_windows.h> class DirectShowPostedEvent; |