summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2009-08-26 12:38:48 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2009-08-26 12:38:48 (GMT)
commitb69a8a9f6a88f6da971fd18641cfac26cc1035f5 (patch)
tree3222d7ffd8ae7faa493f3551b2817e175919ae55
parenta49d181c2700123a0c9af922c86b89914b402e9d (diff)
downloadQt-b69a8a9f6a88f6da971fd18641cfac26cc1035f5.zip
Qt-b69a8a9f6a88f6da971fd18641cfac26cc1035f5.tar.gz
Qt-b69a8a9f6a88f6da971fd18641cfac26cc1035f5.tar.bz2
Revert "qglobal.h now has the definition for WINVER"
This reverts commit f7ebdd380d16a7be9713930b5ab41c32e996dcdb. defining WINVER in qglobal.h is about to be reverted.
-rw-r--r--src/corelib/global/qt_windows.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/corelib/global/qt_windows.h b/src/corelib/global/qt_windows.h
index 6e3f242..dd722f9 100644
--- a/src/corelib/global/qt_windows.h
+++ b/src/corelib/global/qt_windows.h
@@ -53,6 +53,13 @@
#endif
#endif
+#if defined(Q_CC_MINGW)
+// mingw's windows.h does not set _WIN32_WINNT, resulting breaking compilation
+#ifndef WINVER
+#define WINVER 0x500
+#endif
+#endif
+
#include <windows.h>
#ifdef _WIN32_WCE