aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2024-02-21 17:11:50 +0100
committerUlf Hermann <ulf.hermann@qt.io>2024-02-26 14:50:06 +0100
commite3f593da8e97fd28c887d4e26d22f9417f82a13e (patch)
treefce6c6e1ead6c26dcf91b7a80b728915d4bf259f /src/qml/qml
parent3d4c61f0759605069db1d946668ef696dfb7eb98 (diff)
QtQml: Re-allow change signals in QQmlProperty
Amends commit a1ce0596e517e84913b14ab23422137c95b8c785. Pick-to: 6.7 Task-number: QTBUG-109548 Change-Id: I476c1798bb9a125264375e6fb0829e1357d99770 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/qml/qml')
-rw-r--r--src/qml/qml/qqmlproperty.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp
index a66704cb4a..7c78fbb984 100644
--- a/src/qml/qml/qqmlproperty.cpp
+++ b/src/qml/qml/qqmlproperty.cpp
@@ -364,8 +364,8 @@ void QQmlPropertyPrivate::initProperty(QObject *obj, const QString &name,
};
QQmlData *ddata = QQmlData::get(currentObject, false);
- auto findChangeSignal = [&](QStringView changedHandlerName) {
- if (auto propName = QQmlSignalNames::changedHandlerNameToPropertyName(changedHandlerName)) {
+ auto findChangeSignal = [&](QStringView signalName) {
+ if (auto propName = QQmlSignalNames::changedSignalNameToPropertyName(signalName)) {
const QQmlPropertyData *d =
ddata->propertyCache->property(*propName, currentObject, context);
while (d && d->isFunction())
@@ -398,7 +398,7 @@ void QQmlPropertyPrivate::initProperty(QObject *obj, const QString &name,
return true;
}
- return findChangeSignal(terminal);
+ return findChangeSignal(signalName);
}
return findSignalInMetaObject(signalName.toUtf8());