diff options
7 files changed, 14 insertions, 10 deletions
diff --git a/src/corelib/tools/qdatetime.h b/src/corelib/tools/qdatetime.h index af257eaa40..a648285e89 100644 --- a/src/corelib/tools/qdatetime.h +++ b/src/corelib/tools/qdatetime.h @@ -46,15 +46,6 @@ #include <QtCore/qnamespace.h> #include <QtCore/qsharedpointer.h> -// windows.h defines these identifiers, so undefine it -// ### figure out where in Qt we include it too soon -#ifdef max -# undef max -#endif -#ifdef min -# undef min -#endif - #include <limits> QT_BEGIN_HEADER diff --git a/src/network/socket/qnativesocketengine_win.cpp b/src/network/socket/qnativesocketengine_win.cpp index bc26a7f9c2..60c4c73950 100644 --- a/src/network/socket/qnativesocketengine_win.cpp +++ b/src/network/socket/qnativesocketengine_win.cpp @@ -39,6 +39,9 @@ ** ****************************************************************************/ +// Prevent windows system header files from defining min/max as macros. +#define NOMINMAX + #include <winsock2.h> #include <ws2tcpip.h> diff --git a/src/plugins/platforms/windows/accessible/comutils.cpp b/src/plugins/platforms/windows/accessible/comutils.cpp index 2823306609..05227c9e51 100644 --- a/src/plugins/platforms/windows/accessible/comutils.cpp +++ b/src/plugins/platforms/windows/accessible/comutils.cpp @@ -38,6 +38,9 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ + +#include <qt_windows.h> + #include <ocidl.h> #include <olectl.h> diff --git a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp index fbcaa2ca53..5285425b32 100644 --- a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp +++ b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp @@ -50,6 +50,9 @@ # define QT_NO_GETADDRINFO #endif +// To prevent windows system header files from re-defining min/max +#define NOMINMAX + #if defined(Q_OS_WIN) && !defined(QT_NO_GETADDRINFO) # include <winsock2.h> # include <ws2tcpip.h> diff --git a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp index 1d9ba55797..d37f0b7490 100644 --- a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp +++ b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp @@ -40,6 +40,8 @@ ****************************************************************************/ #include <qglobal.h> +// To prevent windows system header files from re-defining min/max +#define NOMINMAX #if defined(_WIN32) #include <winsock2.h> #else diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp index 13c5d961d7..4caca29509 100644 --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp @@ -41,6 +41,8 @@ #include <qglobal.h> +// To prevent windows system header files from re-defining min/max +#define NOMINMAX #if defined(_WIN32) #include <winsock2.h> #else diff --git a/tests/benchmarks/corelib/io/qdiriterator/main.cpp b/tests/benchmarks/corelib/io/qdiriterator/main.cpp index 758f390ec3..340ed9380f 100644 --- a/tests/benchmarks/corelib/io/qdiriterator/main.cpp +++ b/tests/benchmarks/corelib/io/qdiriterator/main.cpp @@ -43,7 +43,7 @@ #include <QString> #ifdef Q_OS_WIN -# include <windows.h> +# include <qt_windows.h> #else # include <sys/stat.h> # include <sys/types.h> |