summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qsharedmemory.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/kernel/qsharedmemory.h')
-rw-r--r--src/corelib/kernel/qsharedmemory.h19
1 files changed, 1 insertions, 18 deletions
diff --git a/src/corelib/kernel/qsharedmemory.h b/src/corelib/kernel/qsharedmemory.h
index b52a67f044..653fb1fb64 100644
--- a/src/corelib/kernel/qsharedmemory.h
+++ b/src/corelib/kernel/qsharedmemory.h
@@ -19,14 +19,9 @@ QT_BEGIN_NAMESPACE
class QSharedMemoryPrivate;
-class Q_CORE_EXPORT QSharedMemory
-#ifndef QT_NO_QOBJECT
- : public QObject
-#endif
+class Q_CORE_EXPORT QSharedMemory : public QObject
{
-#ifndef QT_NO_QOBJECT
Q_OBJECT
-#endif
Q_DECLARE_PRIVATE(QSharedMemory)
public:
@@ -49,17 +44,8 @@ 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);
@@ -88,9 +74,6 @@ public:
private:
Q_DISABLE_COPY(QSharedMemory)
-#ifdef QT_NO_QOBJECT
- QScopedPointer<QSharedMemoryPrivate> d_ptr;
-#endif
};
#endif // QT_CONFIG(sharedmemory)