diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2009-11-16 14:38:45 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-11-18 07:35:29 (GMT) |
| commit | b2c03596aa24d32a537fefa09c0855b0d90cb1d2 (patch) | |
| tree | f2ffde94458dc1082cc48fbfccef80d5e0273f02 | |
| parent | 500d423a71ac734b47eaad97e0a52ef954ae40d3 (diff) | |
| download | Qt-b2c03596aa24d32a537fefa09c0855b0d90cb1d2.zip Qt-b2c03596aa24d32a537fefa09c0855b0d90cb1d2.tar.gz Qt-b2c03596aa24d32a537fefa09c0855b0d90cb1d2.tar.bz2 | |
Fix QT_NO_SHAREDMEMORY while not breaking the QNX build
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
(cherry picked from commit 8d174d68216bf7290b36fa02332e04f1eda829db)
| -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" |