diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-13 13:38:13 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-13 14:37:20 +0200 |
| commit | 6dd107b846336dbcfec79fee24ff0c7544882747 (patch) | |
| tree | a5601bb2764ead1cb3e69f06e91d82050f478588 /src/assistant/clucene | |
| parent | c19a65f19a8161c25421072ce23deae64852729d (diff) | |
| download | qttools-6dd107b846336dbcfec79fee24ff0c7544882747.tar.gz | |
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>
Diffstat (limited to 'src/assistant/clucene')
| -rw-r--r-- | src/assistant/clucene/qclucene_global_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/assistant/clucene/qclucene_global_p.h b/src/assistant/clucene/qclucene_global_p.h index 97b8248f2..41641dcc9 100644 --- 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 |