From 443f99eafb2337f23272f02b1e4c28d9e8310c67 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 23 Sep 2013 11:26:16 +0200 Subject: Fix bindings on properties in grouped value type properties ... such as point.x: { someExpression } This requires special handling to install the QQmlBinding not on the value type itself (not possible) but on the point property itself. Fixes tst_qqmllanguage::valueTypes Change-Id: I8f95379e1872dff7cdcc0480c229a5e68f3cf575 Reviewed-by: Lars Knoll --- src/qml/qml/qqmlobjectcreator_p.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/qml/qml/qqmlobjectcreator_p.h') diff --git a/src/qml/qml/qqmlobjectcreator_p.h b/src/qml/qml/qqmlobjectcreator_p.h index fe3a4bb00a..131271c5c6 100644 --- a/src/qml/qml/qqmlobjectcreator_p.h +++ b/src/qml/qml/qqmlobjectcreator_p.h @@ -127,7 +127,8 @@ public: private: QObject *createInstance(int index, QObject *parent = 0); - bool populateInstance(int index, QObject *instance, QQmlRefPointer cache, QObject *scopeObjectForJavaScript); + bool populateInstance(int index, QObject *instance, QQmlRefPointer cache, + QObject *scopeObjectForJavaScript, QQmlPropertyData *valueTypeProperty); void setupBindings(); bool setPropertyValue(QQmlPropertyData *property, int index, const QV4::CompiledData::Binding *binding); @@ -146,6 +147,8 @@ private: QQmlCompiledData *compiledData; QObject *_qobject; + QObject *_qobjectForBindings; + QQmlPropertyData *_valueTypeProperty; // belongs to _qobjectForBindings's property cache const QV4::CompiledData::Object *_compiledObject; QQmlData *_ddata; QQmlRefPointer _propertyCache; -- cgit v1.2.3