diff --git a/src/corelib/kernel/qproperty.cpp b/src/corelib/kernel/qproperty.cpp index 8fdd261e08..09c74f1ed2 100644 --- a/src/corelib/kernel/qproperty.cpp +++ b/src/corelib/kernel/qproperty.cpp @@ -540,7 +540,7 @@ void QPropertyBindingData::registerWithCurrentlyEvaluatingBinding_helper(Binding QPropertyObserverPointer dependencyObserver = currentState->binding->allocateDependencyObserver(); dependencyObserver.setBindingToNotify(currentState->binding); - dependencyObserver.observeProperty(d); + d.addObserver(dependencyObserver.ptr); } void QPropertyBindingData::notifyObservers(QUntypedPropertyData *propertyDataPtr) const diff --git a/src/corelib/kernel/qproperty_p.h b/src/corelib/kernel/qproperty_p.h index 07f9099ee3..14dfd513f9 100644 --- a/src/corelib/kernel/qproperty_p.h +++ b/src/corelib/kernel/qproperty_p.h @@ -293,12 +293,17 @@ public: heapObservers->clear(); dependencyObserverCount = 0; } - QPropertyObserverPointer allocateDependencyObserver() - { + + Q_ALWAYS_INLINE QPropertyObserverPointer allocateDependencyObserver() { if (dependencyObserverCount < inlineDependencyObservers.size()) { ++dependencyObserverCount; return {&inlineDependencyObservers[dependencyObserverCount - 1]}; } + return allocateDependencyObserver_slow(); + } + + Q_NEVER_INLINE QPropertyObserverPointer allocateDependencyObserver_slow() + { ++dependencyObserverCount; if (!heapObservers) heapObservers.reset(new std::vector());