diff --git a/src/corelib/compat/removed_api.cpp b/src/corelib/compat/removed_api.cpp index df15a10c9ef..16811bf37e6 100644 --- a/src/corelib/compat/removed_api.cpp +++ b/src/corelib/compat/removed_api.cpp @@ -60,6 +60,17 @@ int QMetaType::id() const #endif // QT_CORE_REMOVED_SINCE(6, 1) +#if QT_CORE_REMOVED_SINCE(6, 2) + +#include "qbindingstorage.h" + +void QBindingStorage::maybeUpdateBindingAndRegister_helper(const QUntypedPropertyData *data) const +{ + registerDependency_helper(data); +} + +#endif // QT_CORE_REMOVED_SINCE(6, 2) + #if QT_CORE_REMOVED_SINCE(6, 3) #include "qbytearraymatcher.h" diff --git a/src/corelib/kernel/qbindingstorage.h b/src/corelib/kernel/qbindingstorage.h index bfc3e31d3f1..2ffaf18adfd 100644 --- a/src/corelib/kernel/qbindingstorage.h +++ b/src/corelib/kernel/qbindingstorage.h @@ -94,8 +94,10 @@ public: return nullptr; return bindingData_helper(data); } - // ### Qt 7: remove unused BIC shim + +#if QT_CORE_REMOVED_SINCE(6, 2) void maybeUpdateBindingAndRegister(const QUntypedPropertyData *data) const { registerDependency(data); } +#endif QtPrivate::QPropertyBindingData *bindingData(QUntypedPropertyData *data, bool create) { @@ -106,8 +108,10 @@ public: private: void clear(); void registerDependency_helper(const QUntypedPropertyData *data) const; +#if QT_CORE_REMOVED_SINCE(6, 2) // ### Unused, but keep for BC void maybeUpdateBindingAndRegister_helper(const QUntypedPropertyData *data) const; +#endif QtPrivate::QPropertyBindingData *bindingData_helper(const QUntypedPropertyData *data) const; QtPrivate::QPropertyBindingData *bindingData_helper(QUntypedPropertyData *data, bool create); }; diff --git a/src/corelib/kernel/qproperty.cpp b/src/corelib/kernel/qproperty.cpp index 32b8882369f..984d2072043 100644 --- a/src/corelib/kernel/qproperty.cpp +++ b/src/corelib/kernel/qproperty.cpp @@ -2207,12 +2207,6 @@ void QBindingStorage::clear() d = nullptr; } -// ### Unused, retained for BC with 6.0 -void QBindingStorage::maybeUpdateBindingAndRegister_helper(const QUntypedPropertyData *data) const -{ - registerDependency_helper(data); -} - void QBindingStorage::registerDependency_helper(const QUntypedPropertyData *data) const { Q_ASSERT(bindingStatus);