diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-04 15:58:39 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-04 15:58:39 +0200 |
| commit | b5695bd5be908970244919bcd7c19cbf7ccca2c4 (patch) | |
| tree | 29f1e2895bef25db5b47e7e2cf01414f6b32ac8d /src/corelib/kernel/qcore_unix_p.h | |
| parent | 840729a931a7d3fefbc4b4a8e01f8b1bd69a427e (diff) | |
| parent | b7744e0b05255fc468db2af215ba94eca4b7757b (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ibd81cd1df4a0650d93fcb556a57be90be2e1f569
Diffstat (limited to 'src/corelib/kernel/qcore_unix_p.h')
| -rw-r--r-- | src/corelib/kernel/qcore_unix_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/kernel/qcore_unix_p.h b/src/corelib/kernel/qcore_unix_p.h index 53f2a50191..125ced6fc9 100644 --- a/src/corelib/kernel/qcore_unix_p.h +++ b/src/corelib/kernel/qcore_unix_p.h @@ -79,6 +79,10 @@ #include <errno.h> #include <fcntl.h> +#if !defined(QT_POSIX_IPC) && !defined(QT_NO_SHAREDMEMORY) && !defined(Q_OS_ANDROID) +# include <sys/ipc.h> +#endif + #if defined(Q_OS_VXWORKS) # include <ioLib.h> #endif |