5 files changed, 63 insertions, 9 deletions
diff --git a/src/corelib/kernel/qsharedmemory.cpp b/src/corelib/kernel/qsharedmemory.cpp
index c952655cb8..39f3002394 100644
--- a/src/corelib/kernel/qsharedmemory.cpp
+++ b/src/corelib/kernel/qsharedmemory.cpp
@@ -150,11 +150,18 @@ QSharedMemoryPrivate::makePlatformSafeKey(const QString &key,
 
   \sa setKey()
  */
+
+#ifndef QT_NO_QOBJECT
 QSharedMemory::QSharedMemory(QObject *parent)
   : QObject(*new QSharedMemoryPrivate, parent)
 {
 }
-
+#else
+QSharedMemory::QSharedMemory()
+    : d_ptr(new QSharedMemoryPrivate)
+{
+}
+#endif
 /*!
   Constructs a shared memory object with the given \a parent and with
   its key set to \a key. Because its key is set, its create() and
@@ -162,11 +169,19 @@ QSharedMemory::QSharedMemory(QObject *parent)
 
   \sa setKey(), create(), attach()
  */
+#ifndef QT_NO_QOBJECT
 QSharedMemory::QSharedMemory(const QString &key, QObject *parent)
     : QObject(*new QSharedMemoryPrivate, parent)
 {
     setKey(key);
 }
+#else
+QSharedMemory::QSharedMemory(const QString &key)
+    : d_ptr(new QSharedMemoryPrivate)
+{
+    setKey(key);
+}
+#endif
 
 /*!
   The destructor clears the key, which forces the shared memory object
@@ -604,4 +619,6 @@ QString QSharedMemory::errorString() const
 
 QT_END_NAMESPACE
 
+#ifndef QT_NO_QOBJECT
 #include "moc_qsharedmemory.cpp"
+#endif
diff --git a/src/corelib/kernel/qsharedmemory.h b/src/corelib/kernel/qsharedmemory.h
index 67cf52ac17..6236c6aa4c 100644
--- a/src/corelib/kernel/qsharedmemory.h
+++ b/src/corelib/kernel/qsharedmemory.h
@@ -40,8 +40,14 @@
 #ifndef QSHAREDMEMORY_H
 #define QSHAREDMEMORY_H
 
-#include <QtCore/qobject.h>
-
+#include <QtCore/qglobal.h>
+#ifndef QT_NO_QOBJECT
+# include <QtCore/qobject.h>
+#else
+# include <QtCore/qobjectdefs.h>
+# include <QtCore/qscopedpointer.h>
+# include <QtCore/qstring.h>
+#endif
 QT_BEGIN_NAMESPACE
 
 
@@ -49,9 +55,14 @@ QT_BEGIN_NAMESPACE
 
 class QSharedMemoryPrivate;
 
-class Q_CORE_EXPORT QSharedMemory : public QObject
+class Q_CORE_EXPORT QSharedMemory
+#ifndef QT_NO_QOBJECT
+    : public QObject
+#endif
 {
+#ifndef QT_NO_QOBJECT
     Q_OBJECT
+#endif
     Q_DECLARE_PRIVATE(QSharedMemory)
 
 public:
@@ -74,8 +85,17 @@ public:
         UnknownError
     };
 
+#ifndef QT_NO_QOBJECT
     QSharedMemory(QObject *parent = nullptr);
     QSharedMemory(const QString &key, QObject *parent = nullptr);
+#else
+    QSharedMemory();
+    QSharedMemory(const QString &key);
+    static QString tr(const char * str)
+    {
+        return QString::fromLatin1(str);
+    }
+#endif
     ~QSharedMemory();
 
     void setKey(const QString &key);
@@ -104,6 +124,9 @@ public:
 
 private:
     Q_DISABLE_COPY(QSharedMemory)
+#ifdef QT_NO_QOBJECT
+    QScopedPointer<QSharedMemoryPrivate> d_ptr;
+#endif
 };
 
 #endif // QT_NO_SHAREDMEMORY
diff --git a/src/corelib/kernel/qsharedmemory_p.h b/src/corelib/kernel/qsharedmemory_p.h
index bf7c42dc62..e6e989abda 100644
--- a/src/corelib/kernel/qsharedmemory_p.h
+++ b/src/corelib/kernel/qsharedmemory_p.h
@@ -67,7 +67,10 @@ namespace QSharedMemoryPrivate
 #else
 
 #include "qsystemsemaphore.h"
-#include "private/qobject_p.h"
+
+#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>
@@ -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();
diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp
index d1d44747e0..f6d7e78441 100644
--- a/src/corelib/kernel/qsharedmemory_unix.cpp
+++ b/src/corelib/kernel/qsharedmemory_unix.cpp
@@ -64,8 +64,11 @@
 #ifndef QT_NO_SHAREDMEMORY
 QT_BEGIN_NAMESPACE
 
-QSharedMemoryPrivate::QSharedMemoryPrivate()
-    : QObjectPrivate(), memory(0), size(0), error(QSharedMemory::NoError),
+QSharedMemoryPrivate::QSharedMemoryPrivate() :
+#ifndef QT_NO_QOBJECT
+    QObjectPrivate(),
+#endif
+    memory(0), size(0), error(QSharedMemory::NoError),
 #ifndef QT_NO_SYSTEMSEMAPHORE
       systemSemaphore(QString()), lockedByMe(false),
 #endif
diff --git a/src/corelib/kernel/qsharedmemory_win.cpp b/src/corelib/kernel/qsharedmemory_win.cpp
index c1dba30e2b..02de2339a5 100644
--- a/src/corelib/kernel/qsharedmemory_win.cpp
+++ b/src/corelib/kernel/qsharedmemory_win.cpp
@@ -47,7 +47,10 @@ QT_BEGIN_NAMESPACE
 
 #ifndef QT_NO_SHAREDMEMORY
 
-QSharedMemoryPrivate::QSharedMemoryPrivate() : QObjectPrivate(),
+QSharedMemoryPrivate::QSharedMemoryPrivate() :
+#ifndef QT_NO_QOBJECT
+    QObjectPrivate(),
+#endif
         memory(0), size(0), error(QSharedMemory::NoError),
            systemSemaphore(QString()), lockedByMe(false), hand(0)
 {