summaryrefslogtreecommitdiffstats
path: root/src/plugins/directshow
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-06-13 12:13:36 +0200
committerQt by Nokia <qt-info@nokia.com>2012-06-13 12:19:17 +0200
commit40a95ed42c34a4bdcd89c768a965c603714c5108 (patch)
tree193e486a919f32e4f2ed631ec24fd8d5200846ef /src/plugins/directshow
parentd1b0862ad4d1dc64d8707464fb891ec397dc4b4a (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/plugins/directshow')
-rw-r--r--src/plugins/directshow/player/directshoweventloop.h2
1 files changed, 1 insertions, 1 deletions
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;