summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorJason Barron <jbarron@trolltech.com>2009-07-28 09:34:20 (GMT)
committerJason Barron <jbarron@trolltech.com>2009-07-28 09:34:20 (GMT)
commita20f8dcbeafa34b50ef69d1c5db0f17b09731d2a (patch)
tree510973b95c107fd08f42423fd04a75e3da0bb5d9 /src/network
parent3643028959f0b38350e57e60ba4000435b75e592 (diff)
downloadQt-a20f8dcbeafa34b50ef69d1c5db0f17b09731d2a.zip
Qt-a20f8dcbeafa34b50ef69d1c5db0f17b09731d2a.tar.gz
Qt-a20f8dcbeafa34b50ef69d1c5db0f17b09731d2a.tar.bz2
Compile fixes after latest merge of 4.6.
The ususal suspects like QScopedPointer fixes, but also some changes since the introduction of qcore_unix.*
Diffstat (limited to 'src/network')
-rw-r--r--src/network/socket/qnativesocketengine_unix.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp
index ea8e756..67a6fdf 100644
--- a/src/network/socket/qnativesocketengine_unix.cpp
+++ b/src/network/socket/qnativesocketengine_unix.cpp
@@ -68,7 +68,12 @@
#include <ctype.h>
#endif
+#ifdef Q_OS_SYMBIAN // ### TODO: Are these headers right?
+#include <sys/socket.h>
+#include <netinet/in.h>
+#else
#include <netinet/tcp.h>
+#endif
QT_BEGIN_NAMESPACE