QPropertyChangeTrigger: Inherit directly from QPropertyObserver

Change-Id: If2ffeef14d33200e39fb8b3e7fd88c232164a241
Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 5 insertions, 4 deletions

diff --git a/src/qml/qml/qqmljavascriptexpression.cpp b/src/qml/qml/qqmljavascriptexpression.cpp
index 88a9932f53..c711f0ab70 100644
--- a/src/qml/qml/qqmljavascriptexpression.cpp
+++ b/src/qml/qml/qqmljavascriptexpression.cpp
@@ -447,13 +447,14 @@ void QQmlJavaScriptExpression::setCompilationUnit(const QQmlRefPointer<QV4::Exec
     m_compilationUnit = compilationUnit;
 }
 
-void QPropertyChangeTrigger::operator()() {
-    m_expression->expressionChanged();
+void QPropertyChangeTrigger::trigger(QPropertyObserver *observer, QUntypedPropertyData *) {
+    auto This = static_cast<QPropertyChangeTrigger *>(observer);
+    This->m_expression->expressionChanged();
 }
 
-QPropertyChangeHandler<QPropertyChangeTrigger> *QQmlJavaScriptExpression::allocatePropertyChangeTrigger(QObject *target, int propertyIndex)
+QPropertyChangeTrigger *QQmlJavaScriptExpression::allocatePropertyChangeTrigger(QObject *target, int propertyIndex)
 {
-    auto trigger = QQmlEnginePrivate::get(engine())->qPropertyTriggerPool.New(QPropertyChangeTrigger { this });
+    auto trigger = QQmlEnginePrivate::get(engine())->qPropertyTriggerPool.New( this );
     trigger->target = target;
     trigger->propertyIndex = propertyIndex;
     auto oldHead = qpropertyChangeTriggers;