diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-03-03 13:37:38 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-03-03 13:37:38 +0100 |
commit | c0a5e8c9d77aefd6c403af39908e56414a921522 (patch) | |
tree | c07b28deb9abc9789386f1b10585f1c661bfcba5 /src/corelib/kernel/qsharedmemory_posix.cpp | |
parent | 4fd8513475222ee0afb6f18ec90ba384ffb03bc4 (diff) | |
parent | 2b5982aac8ad103443e33379fe5654f5bd419c87 (diff) |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/plugins/platforms/xcb/qxcbscreen.cpp
Change-Id: Ie42931791a849b34b63d814d2eb5ac653986d868
Diffstat (limited to 'src/corelib/kernel/qsharedmemory_posix.cpp')
-rw-r--r-- | src/corelib/kernel/qsharedmemory_posix.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/corelib/kernel/qsharedmemory_posix.cpp b/src/corelib/kernel/qsharedmemory_posix.cpp index 4f9b3b1429..74f98a158a 100644 --- a/src/corelib/kernel/qsharedmemory_posix.cpp +++ b/src/corelib/kernel/qsharedmemory_posix.cpp @@ -46,7 +46,6 @@ #ifndef QT_NO_SHAREDMEMORY #include <sys/types.h> -#include <sys/ipc.h> #include <sys/mman.h> #include <sys/stat.h> #include <fcntl.h> |