summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-02-08 09:21:28 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-03-20 10:56:27 (GMT)
commitcf60176e141a930d7960b9a69b621e9bec03cea8 (patch)
tree76e4bbcba6d7576215bef273953ab47e506d9bdb /tools
parent40bfc0b25734895ec78fa5099028c31a8daa0371 (diff)
downloadQt-cf60176e141a930d7960b9a69b621e9bec03cea8.zip
Qt-cf60176e141a930d7960b9a69b621e9bec03cea8.tar.gz
Qt-cf60176e141a930d7960b9a69b621e9bec03cea8.tar.bz2
remove bizarre magic from precompiled header
it doesn't serve any puropse (any more?) and it breaks the mingw build. Change-Id: I02a5e7502586e7e9f5956991498ff602eff66e81 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> (cherry picked from commit 0678a7db8e8eb6997b0acb106dd4347ef8c76fbe)
Diffstat (limited to 'tools')
-rw-r--r--tools/configure/configure_pch.h27
1 files changed, 1 insertions, 26 deletions
diff --git a/tools/configure/configure_pch.h b/tools/configure/configure_pch.h
index 596a743..87215d4 100644
--- a/tools/configure/configure_pch.h
+++ b/tools/configure/configure_pch.h
@@ -39,36 +39,11 @@
**
****************************************************************************/
-#if (defined(_WIN32) || defined(__NT__))
-# define QT_UNDEF_MACROS_IN_PCH
-# define _WINSCARD_H_
-# define _POSIX_ /* Make sure PATH_MAX et al. are defined */
-# include <limits.h>
-# undef _POSIX_ /* Don't polute */
-
- /* Make sure IP v6 is defined first of all, before windows.h */
-# ifndef QT_NO_IPV6
-# include <winsock2.h>
-# endif
-# include <stdlib.h>
-#endif
-
-#if defined __cplusplus
+#include <qplatformdefs.h>
#include <qglobal.h>
#include <qlist.h>
#include <qvariant.h> // All moc genereated code has this include
-#include <qplatformdefs.h>
#include <qregexp.h>
#include <qstring.h>
#include <qstringlist.h>
#include <qtextcodec.h>
-
-#include <limits.h>
-#include <stdlib.h>
-#endif
-
-#if defined(QT_UNDEF_MACROS_IN_PCH)
-# undef max /* These are defined in windef.h, but */
-# undef min /* we don't want them when building Qt */
-# undef _WINSCARD_H_
-#endif