summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2009-08-26 14:10:45 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2009-08-26 14:10:45 (GMT)
commit743117fa94b5e8807b0b9f9b16f2a712e6bfb47f (patch)
treef5d6c4206af385c940e36d94b49c5480d5804dbb /src/corelib
parent5ef11e48dd3bd8a6d51028128ee957aba27b0100 (diff)
parent5be87d57602d72c225943f052783c1053cd3d81a (diff)
downloadQt-743117fa94b5e8807b0b9f9b16f2a712e6bfb47f.zip
Qt-743117fa94b5e8807b0b9f9b16f2a712e6bfb47f.tar.gz
Qt-743117fa94b5e8807b0b9f9b16f2a712e6bfb47f.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/corelib')
-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