summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-11-17 17:38:37 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-11-17 17:38:50 (GMT)
commita61adccf96a8ceefbf1150966adda3f6d226ec6d (patch)
tree7f01b588860f34b27f9c68146b603948d391bb8c /src/corelib
parent334b2a93d461ae9a8b258fff1971fb775b13bb68 (diff)
parentecc202c0410125c944f156b5d0de67f093c02723 (diff)
downloadQt-a61adccf96a8ceefbf1150966adda3f6d226ec6d.zip
Qt-a61adccf96a8ceefbf1150966adda3f6d226ec6d.tar.gz
Qt-a61adccf96a8ceefbf1150966adda3f6d226ec6d.tar.bz2
Merge oslo-staging-2/4.6 into upstream/4.6
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/kernel/qsharedmemory_unix.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp
index 40b9f04..a850df0 100644
--- a/src/corelib/kernel/qsharedmemory_unix.cpp
+++ b/src/corelib/kernel/qsharedmemory_unix.cpp
@@ -49,6 +49,7 @@
#include <errno.h>
+#ifndef QT_NO_SHAREDMEMORY
#include <sys/types.h>
#include <sys/ipc.h>
#include <sys/shm.h>
@@ -56,6 +57,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
+#endif //QT_NO_SHAREDMEMORY
#include "private/qcore_unix_p.h"