diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-11-20 12:19:09 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-11-20 12:19:09 (GMT) |
| commit | b5294497836db44261c97cfeab28d0ac4f8402f1 (patch) | |
| tree | c4331314445b41166ce2cd22a80c9fb9f46b5023 /src/corelib/kernel/qsharedmemory_unix.cpp | |
| parent | 2473ab1cf217a989849190cbfa47fe312698adb9 (diff) | |
| parent | 1b8d5bec5763708c66e7bd586aee3df7f94b5cb5 (diff) | |
| download | Qt-b5294497836db44261c97cfeab28d0ac4f8402f1.zip Qt-b5294497836db44261c97cfeab28d0ac4f8402f1.tar.gz Qt-b5294497836db44261c97cfeab28d0ac4f8402f1.tar.bz2 | |
Merge branch '4.6' into mmfphonon
Conflicts:
demos/qmediaplayer/mediaplayer.cpp
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" |