diff options
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/kernel/qobject.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index b631b534c2e..d3566b1081e 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -152,9 +152,9 @@ void (*QAbstractDeclarativeData::setWidgetParent)(QObject *, QObject *) = nullpt QObjectData::~QObjectData() {} -QT7_ONLY(const) -QMetaObject *QObjectData::dynamicMetaObject() const +const QMetaObject *QObjectData::dynamicMetaObject() const { + // ### keep in sync with removed_api.cpp version return metaObject->toDynamicMetaObject(q_ptr); } diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h index 6b82a6ad4f6..26cbd80fb9c 100644 --- a/src/corelib/kernel/qobject.h +++ b/src/corelib/kernel/qobject.h @@ -90,10 +90,10 @@ public: QDynamicMetaObjectData *metaObject; QBindingStorage bindingStorage; -#if QT_VERSION >= QT_VERSION_CHECK(7, 0, 0) - const QMetaObject *dynamicMetaObject() const; -#else +#if QT_CORE_REMOVED_SINCE(6, 9) && defined(Q_COMPILER_MANGLES_RETURN_TYPE) QMetaObject *dynamicMetaObject() const; +#else + const QMetaObject *dynamicMetaObject() const; #endif #ifdef QT_DEBUG |