diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-02-15 16:30:25 +0100 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-02-16 02:28:53 +0100 |
| commit | 221df41572cc5bff108eb5809be4b081075a5cbb (patch) | |
| tree | ccdc510ecaabe321019d8772da8c70ffbf04314f | |
| parent | d1f077a43583d7533dcd0f629250a6416d089248 (diff) | |
Move QBindingStorage methods marked for removal to removed_api
From the API review.
Pick-to: 6.3
Change-Id: I676ff811a3b3d43ebcbee78ed0210d669d642947
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
| -rw-r--r-- | src/corelib/compat/removed_api.cpp | 11 | ||||
| -rw-r--r-- | src/corelib/kernel/qbindingstorage.h | 6 | ||||
| -rw-r--r-- | src/corelib/kernel/qproperty.cpp | 6 |
3 files changed, 16 insertions, 7 deletions
diff --git a/src/corelib/compat/removed_api.cpp b/src/corelib/compat/removed_api.cpp index df15a10c9e..16811bf37e 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 bfc3e31d3f..2ffaf18adf 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 32b8882369..984d207204 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); |