summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2009-11-16 14:38:45 (GMT)
committerJørgen Lind <jorgen.lind@nokia.com>2009-11-16 14:48:33 (GMT)
commit8d174d68216bf7290b36fa02332e04f1eda829db (patch)
tree0dce3b5959660b982c33df9775b3735dd42ef94f
parentabc6f7047823f391c3fa30774b81d60a8ba451be (diff)
downloadQt-8d174d68216bf7290b36fa02332e04f1eda829db.zip
Qt-8d174d68216bf7290b36fa02332e04f1eda829db.tar.gz
Qt-8d174d68216bf7290b36fa02332e04f1eda829db.tar.bz2
Fix QT_NO_SHAREDMEMORY while not breaking the QNX build
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
-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"