diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-18 13:39:40 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-18 13:39:40 +0100 |
| commit | d46da3a141ad05c9f7cd7ea94e254980748329da (patch) | |
| tree | 72beadfabcf66d725b10bbc5ce3d8c38137ed888 /src/corelib | |
| parent | 62e641691b9a3eadc8b9fb2e31150cdf5b66115d (diff) | |
| parent | 6f6b2ab07c0dbd0ebdb25f1fbe537ea12bdffee4 (diff) | |
Merge remote branch 'mainline/4.6' into 4.6
Diffstat (limited to 'src/corelib')
| -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 40b9f04f81..a850df084e 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" |