diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-11 11:16:42 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-11 11:16:42 +0200 |
| commit | 4e875d988e99df57c439f481e258e2138fdb9410 (patch) | |
| tree | 15f79917b0e303445976028cb541668a1ebb67f1 /src/corelib/kernel | |
| parent | 6e42979518aa0697ff31706616ddbc05486f1864 (diff) | |
| parent | 3e75c2965c96fa014ab74121e84d623fd04a27f7 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/qt6
Change-Id: Ieb8efee9d74229b9f141ec715e3a9557586b51e8
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qsharedmemory_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qsharedmemory_p.h b/src/corelib/kernel/qsharedmemory_p.h index 59802eb6ce..bf7c42dc62 100644 --- a/src/corelib/kernel/qsharedmemory_p.h +++ b/src/corelib/kernel/qsharedmemory_p.h @@ -69,7 +69,7 @@ namespace QSharedMemoryPrivate #include "qsystemsemaphore.h" #include "private/qobject_p.h" -#if !defined(Q_OS_WIN) && !defined(Q_OS_ANDROID) && !defined(Q_OS_INTEGRITY) +#if !defined(Q_OS_WIN) && !defined(Q_OS_ANDROID) && !defined(Q_OS_INTEGRITY) && !defined(Q_OS_RTEMS) # include <sys/sem.h> #endif |