diff options
| author | Marius Bugge Monsen <mmonsen@trolltech.com> | 2009-11-17 15:51:00 (GMT) |
|---|---|---|
| committer | Marius Bugge Monsen <mmonsen@trolltech.com> | 2009-11-17 15:51:00 (GMT) |
| commit | 1188cd220787162a2c8327ea1291a743863b12c5 (patch) | |
| tree | 36ee60fc41010b651fbb0d6a6d77c771c6fbcdc0 /src/corelib/kernel/qsharedmemory_unix.cpp | |
| parent | a380c528344d35a20078c7cc37bcbac3b607e618 (diff) | |
| parent | 7bb7914a183694be43029ed4c39651f3d95cfe67 (diff) | |
| download | Qt-1188cd220787162a2c8327ea1291a743863b12c5.zip Qt-1188cd220787162a2c8327ea1291a743863b12c5.tar.gz Qt-1188cd220787162a2c8327ea1291a743863b12c5.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'src/corelib/kernel/qsharedmemory_unix.cpp')
| -rw-r--r-- | src/corelib/kernel/qsharedmemory_unix.cpp | 2 |
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" |