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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/corelib/kernel/qsharedmemory.cpp | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/corelib/kernel/qsharedmemory.cpp b/src/corelib/kernel/qsharedmemory.cpp index 65ebd7aa82..58fc7d776f 100644 --- a/src/corelib/kernel/qsharedmemory.cpp +++ b/src/corelib/kernel/qsharedmemory.cpp @@ -174,17 +174,11 @@ 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 @@ -192,19 +186,11 @@ QSharedMemory::QSharedMemory() \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 @@ -642,6 +628,4 @@ QString QSharedMemory::errorString() const QT_END_NAMESPACE -#ifndef QT_NO_QOBJECT #include "moc_qsharedmemory.cpp" -#endif |