From 797a8f2aaaa8133ea8a54d9e4b91ba531fab3070 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Fri, 23 Oct 2020 09:50:53 +0200 Subject: QQmlEngine: Add method to explicitly capture a property Also, use that method to capture the uiLanguage notify signal. Previously the wrong signal was captured. The test still happened to pass because we manually re-evaluated all bindings when the uiLanguage property changed. Add a test which avoid that. Change-Id: I3961b60b365a8705930936f20881421bd4ceffe5 Reviewed-by: Fabian Kosmale --- src/qml/qml/qqmlengine.cpp | 15 +++++++++++++++ src/qml/qml/qqmlengine.h | 2 ++ src/qml/qml/v8/qqmlbuiltinfunctions.cpp | 14 +++++--------- 3 files changed, 22 insertions(+), 9 deletions(-) (limited to 'src/qml/qml') diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 3f871d5c6a..b5b36cccb9 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -1326,6 +1326,21 @@ void QQmlEngine::setOutputWarningsToStandardError(bool enabled) d->outputWarningsToMsgLog = enabled; } +/*! + \internal + + Capture the given property as part of a binding. + */ +void QQmlEngine::captureProperty(QObject *object, const QMetaProperty &property) const +{ + Q_D(const QQmlEngine); + if (d->propertyCapture) { + d->propertyCapture->captureProperty( + object, property.propertyIndex(), + QMetaObjectPrivate::signalIndex(property.notifySignal())); + } +} + /*! \qmlproperty string Qt::uiLanguage \since 5.15 diff --git a/src/qml/qml/qqmlengine.h b/src/qml/qml/qqmlengine.h index 0f9e6da63f..37ca25779f 100644 --- a/src/qml/qml/qqmlengine.h +++ b/src/qml/qml/qqmlengine.h @@ -158,6 +158,8 @@ public: template T singletonInstance(int qmlTypeId); + void captureProperty(QObject *object, const QMetaProperty &property) const; + public Q_SLOTS: void retranslate(); diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp index 3b6c448e49..e77738d985 100644 --- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp +++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp @@ -1370,15 +1370,11 @@ ReturnedValue QtObject::method_get_uiLanguage(const FunctionObject *b, const Val QQmlEnginePrivate *ep = QQmlEnginePrivate::get(scope.engine); if (ep && ep->propertyCapture) { - static int propertyIndex = -1; - static int notifySignalIndex = -1; - if (propertyIndex < 0) { - QMetaProperty metaProperty = - QQmlEngine::staticMetaObject.property(QQmlEngine::staticMetaObject.indexOfProperty("uiLanguage")); - propertyIndex = metaProperty.propertyIndex(); - notifySignalIndex = metaProperty.notifySignalIndex(); - } - ep->propertyCapture->captureProperty(QQmlEnginePrivate::get(ep), propertyIndex, notifySignalIndex); + static const QMetaProperty metaProperty + = QQmlEngine::staticMetaObject.property( + QQmlEngine::staticMetaObject.indexOfProperty("uiLanguage")); + QQmlEngine *e = QQmlEnginePrivate::get(ep); + e->captureProperty(e, metaProperty); } return Encode(scope.engine->newString(QJSEnginePrivate::get(jsEngine)->uiLanguage)); -- cgit v1.2.3