diff options
| author | Michael Brasser <mbrasser@ford.com> | 2014-12-11 21:18:00 -0600 |
|---|---|---|
| committer | Michael Brasser <michael.brasser@live.com> | 2014-12-23 00:58:51 +0100 |
| commit | 5adb406bddd8419c2987cec48eb86a0d4ca0260a (patch) | |
| tree | 266e29eba0739751809fd2fdfc85933c38c919de /src/qml/qml/qqmlproperty.cpp | |
| parent | fa3cf15e0577fe382ac577456422ad78325a3977 (diff) | |
Fix QQmlProperty to work correctly with deeply nested objects.
Don't keep reusing the top-level object to look up nested properties.
This allows code such as the following to work correctly:
PropertyChanges {
target: myObject
textChild.font.pixelSize: 24
}
Change-Id: I39e52dbc20d2409fc756a36e668fcf664eb1905f
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlproperty.cpp')
| -rw-r--r-- | src/qml/qml/qqmlproperty.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp index 0ee8f94a66..b85208322a 100644 --- a/src/qml/qml/qqmlproperty.cpp +++ b/src/qml/qml/qqmlproperty.cpp @@ -276,7 +276,7 @@ void QQmlPropertyPrivate::initProperty(QObject *obj, const QString &name) QQmlPropertyData local; QQmlPropertyData *property = - QQmlPropertyCache::property(engine, obj, pathName, context, local); + QQmlPropertyCache::property(engine, currentObject, pathName, context, local); if (!property) return; // Not a property if (property->isFunction()) |