Fix windows build due to min/max macro clash

qdatetime.h uses std::min/max and windows system headers like to redefine
min/max. Include qt_windows.h instead of windows.h to include a workaround
for this conflict.

Change-Id: I756ebfcae2ba5540240fe7e8c7b1ad71e2a99cec
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

diff --git a/src/assistant/clucene/qclucene_global_p.h b/src/assistant/clucene/qclucene_global_p.h
index 97b8248..41641dc 100644 (file)
--- a/src/assistant/clucene/qclucene_global_p.h
+++ b/src/assistant/clucene/qclucene_global_p.h
@@ -41,7 +41,7 @@
 #       define TCHAR wchar_t
 #   endif
 #else
-#   include <windows.h>
+#   include <qt_windows.h>
 #endif
 
 QT_BEGIN_HEADER

diff --git a/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp b/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp
index 2e8eda4..2627afd 100644 (file)
--- a/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp
+++ b/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp
@@ -54,6 +54,7 @@
 #include <QtCore/QUuid>
 #include <ActiveQt/qaxselect.h>
 
+#include <qt_windows.h>
 #include <olectl.h>
 #include <qaxtypes.h>
 

diff --git a/src/designer/src/plugins/activeqt/qdesigneraxwidget.cpp b/src/designer/src/plugins/activeqt/qdesigneraxwidget.cpp
index e07919e..edfc5cd 100644 (file)
--- a/src/designer/src/plugins/activeqt/qdesigneraxwidget.cpp
+++ b/src/designer/src/plugins/activeqt/qdesigneraxwidget.cpp
@@ -49,6 +49,7 @@
 
 #include <ActiveQt/QAxWidget>
 
+#include <qt_windows.h>
 #include <olectl.h>
 #include <qaxtypes.h>