diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2009-11-17 22:56:58 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2009-11-17 22:56:58 (GMT) |
| commit | e22ca6088407987cb69ccd03f162b431d5c2bf99 (patch) | |
| tree | 12bb1de5c59670ad2c966cea60b9fd4d28dead2e /src/corelib/kernel/qsharedmemory_unix.cpp | |
| parent | f2b02ed855f7149afca0cc2e046c09c54a2d4444 (diff) | |
| parent | a61adccf96a8ceefbf1150966adda3f6d226ec6d (diff) | |
| download | Qt-e22ca6088407987cb69ccd03f162b431d5c2bf99.zip Qt-e22ca6088407987cb69ccd03f162b431d5c2bf99.tar.gz Qt-e22ca6088407987cb69ccd03f162b431d5c2bf99.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt 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" |