diff options
Diffstat (limited to 'src/corelib/kernel/qsharedmemory_p.h')
-rw-r--r-- | src/corelib/kernel/qsharedmemory_p.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/corelib/kernel/qsharedmemory_p.h b/src/corelib/kernel/qsharedmemory_p.h index 95fe0d1083..e6e989abda 100644 --- a/src/corelib/kernel/qsharedmemory_p.h +++ b/src/corelib/kernel/qsharedmemory_p.h @@ -67,9 +67,12 @@ namespace QSharedMemoryPrivate #else #include "qsystemsemaphore.h" -#include "private/qobject_p.h" -#if !defined(Q_OS_WIN) && !defined(Q_OS_ANDROID) && !defined(Q_OS_INTEGRITY) +#ifndef QT_NO_QOBJECT +# include "private/qobject_p.h" +#endif + +#if !defined(Q_OS_WIN) && !defined(Q_OS_ANDROID) && !defined(Q_OS_INTEGRITY) && !defined(Q_OS_RTEMS) # include <sys/sem.h> #endif @@ -98,7 +101,7 @@ public: { if (q_sm && q_sm->lock()) return true; - q_sm = 0; + q_sm = nullptr; return false; } @@ -107,9 +110,14 @@ private: }; #endif // QT_NO_SYSTEMSEMAPHORE -class Q_AUTOTEST_EXPORT QSharedMemoryPrivate : public QObjectPrivate +class Q_AUTOTEST_EXPORT QSharedMemoryPrivate +#ifndef QT_NO_QOBJECT + : public QObjectPrivate +#endif { +#ifndef QT_NO_QOBJECT Q_DECLARE_PUBLIC(QSharedMemory) +#endif public: QSharedMemoryPrivate(); |