summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2010-03-23 09:45:33 (GMT)
committerSamuli Piippo <samuli.piippo@digia.com>2011-06-09 10:05:25 (GMT)
commit4450bd467d59e5b124fdb27e46944daa5cb17e4e (patch)
tree122ecf5a525daca9c9faa4d4e8583a8e25b91eea
parentb9ef3b8b5cd54ae2e1feae09b912af8b9c8c8550 (diff)
downloadQt-4450bd467d59e5b124fdb27e46944daa5cb17e4e.zip
Qt-4450bd467d59e5b124fdb27e46944daa5cb17e4e.tar.gz
Qt-4450bd467d59e5b124fdb27e46944daa5cb17e4e.tar.bz2
build fix for mingw
we need to define WIN32_LEAN_AND_MEAN to include both windows.h and winsock2.h (http://msdn.microsoft.com/en-us/library/ms737629(VS.85).aspx) (cherry picked from commit 5d65e3c264332262fb09b8fe6f08d284c088a61d)
-rw-r--r--src/qt3support/network/q3socketdevice_win.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/qt3support/network/q3socketdevice_win.cpp b/src/qt3support/network/q3socketdevice_win.cpp
index bcb8022..d8f5553 100644
--- a/src/qt3support/network/q3socketdevice_win.cpp
+++ b/src/qt3support/network/q3socketdevice_win.cpp
@@ -47,7 +47,6 @@
#include <string.h>
-# include <qt_windows.h>
#if defined (QT_NO_IPV6)
# include <winsock.h>
#else