projects / platform / upstream / qttools.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c19a65f) | patch
Fix windows build due to min/max macro clash
authorSimon Hausmann <simon.hausmann@nokia.com>
Wed, 13 Jun 2012 11:38:13 +0000 (13:38 +0200)
committerQt by Nokia <qt-info@nokia.com>
Wed, 13 Jun 2012 12:37:20 +0000 (14:37 +0200)
commit6dd107b846336dbcfec79fee24ff0c7544882747
treea5601bb2764ead1cb3e69f06e91d82050f478588tree | snapshot
parentc19a65f19a8161c25421072ce23deae64852729dcommit | diff
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>
src/assistant/clucene/qclucene_global_p.h diff | blob | history
src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp diff | blob | history
src/designer/src/plugins/activeqt/qdesigneraxwidget.cpp diff | blob | history
Domain: UI Framework / Qt;