summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-07-15 04:52:18 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-07-15 04:52:18 (GMT)
commitfe591031a8550a8a8c97fa08f0bdf8c2f9d4cf93 (patch)
treeb2b88f39afa20fd0dd1d69938cca74c875820a55 /mkspecs
parent5b849b15fe89c3645a81368faf6b8574c337b4c5 (diff)
parent454096217002f02379b4450e6e3d312f46c8cda9 (diff)
downloadQt-fe591031a8550a8a8c97fa08f0bdf8c2f9d4cf93.zip
Qt-fe591031a8550a8a8c97fa08f0bdf8c2f9d4cf93.tar.gz
Qt-fe591031a8550a8a8c97fa08f0bdf8c2f9d4cf93.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/win32-g++/qplatformdefs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/win32-g++/qplatformdefs.h b/mkspecs/win32-g++/qplatformdefs.h
index c4ee4b4..97c63f5 100644
--- a/mkspecs/win32-g++/qplatformdefs.h
+++ b/mkspecs/win32-g++/qplatformdefs.h
@@ -60,7 +60,7 @@
#include <errno.h>
#include <sys/stat.h>
#include <stdlib.h>
-#include <windows.h>
+#include <qt_windows.h>
#include <limits.h>
#if !defined(_WIN32_WINNT) || (_WIN32_WINNT-0 < 0x0500)