From 1e1b88809261854dee47c9bc105cf71e75b75cb9 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 18 Aug 2020 12:18:27 +0200 Subject: Pass a pointer to the property data into the method evaluating a binding Make it possible to evaluate the binding but write the result into a different memory location. This will help support compat properties, where the setter does a lot of additional work. Change-Id: Ib60220eb629e3dcb5c0d7004b693e92290dfabe5 Reviewed-by: Fabian Kosmale --- src/corelib/kernel/qpropertyprivate.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/corelib/kernel/qpropertyprivate.h') diff --git a/src/corelib/kernel/qpropertyprivate.h b/src/corelib/kernel/qpropertyprivate.h index 6f0e563a28..15e54e9ba8 100644 --- a/src/corelib/kernel/qpropertyprivate.h +++ b/src/corelib/kernel/qpropertyprivate.h @@ -87,10 +87,9 @@ class Q_CORE_EXPORT QPropertyBindingData // notification later when the value changes. mutable quintptr d_ptr = 0; friend struct QT_PREPEND_NAMESPACE(QPropertyBindingDataPointer); + Q_DISABLE_COPY(QPropertyBindingData) public: QPropertyBindingData() = default; - Q_DISABLE_COPY(QPropertyBindingData) - QPropertyBindingData(QPropertyBindingData &&other) = delete; QPropertyBindingData(QPropertyBindingData &&other, QUntypedPropertyData *propertyDataPtr); QPropertyBindingData &operator=(QPropertyBindingData &&other) = delete; ~QPropertyBindingData(); @@ -105,7 +104,7 @@ public: QPropertyBindingWrapper guardCallback = nullptr); QPropertyBindingPrivate *binding() const; - void evaluateIfDirty() const; + void evaluateIfDirty(const QUntypedPropertyData *property) const; void removeBinding(); void registerWithCurrentlyEvaluatingBinding() const; -- cgit v1.2.3