Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake

Change-Id: I715b1d743d5f11560e7b3fbeb8fd64a5e5ddb277

1 files changed, 26 insertions, 3 deletions

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