diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2021-09-17 16:07:10 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2021-09-23 16:57:03 +0200 |
| commit | 298e41b830f60c0f2f078996ace77a4254a9f335 (patch) | |
| tree | 4bf6029da36fb143aeeb11c04a2bdf442ef56b42 /src/corelib/kernel/qobject.cpp | |
| parent | e5d65996a93bbf4cbc8a155887def6efa3ad73de (diff) | |
Remove fatuously true or false QT_VERSION checks
QT_VERSION is now at least QT_VERSION_CHECK(6, 3, 0), so remove all
checks against Qt 6.0.0 or earlier. They are superfluous. Tidied up in
some places in the process, particularly #include order.
Change-Id: I2636b2fd13be5b976f5b043ef2f8cddc038a72a4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/kernel/qobject.cpp')
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 582073a3b2..ad7df773ed 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2016 Intel Corporation. ** Copyright (C) 2013 Olivier Goffart <ogoffart@woboq.com> ** Contact: https://www.qt.io/licensing/ @@ -159,14 +159,6 @@ static inline QBasicMutex *signalSlotLock(const QObject *o) return &_q_ObjectMutexPool[uint(quintptr(o)) % sizeof(_q_ObjectMutexPool)/sizeof(QBasicMutex)]; } -#if QT_VERSION < 0x60000 -extern "C" Q_CORE_EXPORT void qt_addObject(QObject *) -{} - -extern "C" Q_CORE_EXPORT void qt_removeObject(QObject *) -{} -#endif - void (*QAbstractDeclarativeData::destroyed)(QAbstractDeclarativeData *, QObject *) = nullptr; void (*QAbstractDeclarativeData::signalEmitted)(QAbstractDeclarativeData *, QObject *, int, void **) = nullptr; int (*QAbstractDeclarativeData::receivers)(QAbstractDeclarativeData *, const QObject *, int) = nullptr; @@ -953,9 +945,6 @@ QObject::QObject(QObjectPrivate &dd, QObject *parent) QT_RETHROW; } } -#if QT_VERSION < 0x60000 - qt_addObject(this); -#endif if (Q_UNLIKELY(qtHookData[QHooks::AddQObject])) reinterpret_cast<QHooks::AddQObjectCallback>(qtHookData[QHooks::AddQObject])(this); Q_TRACE(QObject_ctor, this); @@ -1114,9 +1103,6 @@ QObject::~QObject() if (!d->children.isEmpty()) d->deleteChildren(); -#if QT_VERSION < 0x60000 - qt_removeObject(this); -#endif if (Q_UNLIKELY(qtHookData[QHooks::RemoveQObject])) reinterpret_cast<QHooks::RemoveQObjectCallback>(qtHookData[QHooks::RemoveQObject])(this); |