diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2022-09-15 13:30:48 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2022-09-16 17:20:18 -0700 |
| commit | de25c1d27dad66fdc72cab194a9f87bdd9f11eb9 (patch) | |
| tree | 36d7f769d9767dd6644fe25943852e2b72d7affa /src/corelib/kernel/qsharedmemory.h | |
| parent | 469dbe5c6d42b3b814d0b99e162c137451222c07 (diff) | |
QSharedMemory: remove QT_NO_QOBJECT
This was only needed for bootstrapped builds, but QSharedMemory is no
longer part of it since commit 75082c9f20271eb7916a7e8e85d2e58b8e4b1392.
Change-Id: If4c23ea3719947d790d4fffd171522c0d5f9aafb
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/corelib/kernel/qsharedmemory.h')
| -rw-r--r-- | src/corelib/kernel/qsharedmemory.h | 19 |
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) |