From de25c1d27dad66fdc72cab194a9f87bdd9f11eb9 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 15 Sep 2022 13:30:48 -0700 Subject: QSharedMemory: remove QT_NO_QOBJECT MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Mårten Nordheim --- src/corelib/kernel/qsharedmemory.cpp | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'src/corelib/kernel/qsharedmemory.cpp') 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 -- cgit v1.2.3