diff options
author | Glenn Watson <glenn.watson@nokia.com> | 2011-11-22 09:13:21 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-22 03:31:11 +0100 |
commit | 0bf08af2b945f10f44561ffa0abd6f89b093b376 (patch) | |
tree | f7cb7e6cd3061eaf3878bf8787708ed03428c07e /src/declarative/qml/qdeclarativevmemetaobject_p.h | |
parent | 3ef0ce6b794ed58d26ec6355cc13fd00f66c5176 (diff) |
Fix default property preventing signals from being emitted.
Change the way connectAlias works so that even if the target
for the connection is not available immediately, anything that
is bound to it is notified when the target is changed.
(Fix is authored by Aaron).
Task-number: QTBUG-21580
Change-Id: Ida23c0e620069c50b123c71b5078929d4c7ec4e4
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/declarative/qml/qdeclarativevmemetaobject_p.h')
-rw-r--r-- | src/declarative/qml/qdeclarativevmemetaobject_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativevmemetaobject_p.h b/src/declarative/qml/qdeclarativevmemetaobject_p.h index 6076dcfe61..de0ac9e4d9 100644 --- a/src/declarative/qml/qdeclarativevmemetaobject_p.h +++ b/src/declarative/qml/qdeclarativevmemetaobject_p.h @@ -139,6 +139,7 @@ struct QDeclarativeVMEMetaData class QV8QObjectWrapper; class QDeclarativeVMEVariant; class QDeclarativeRefCount; +class QDeclarativeVMEMetaObjectEndpoint; class Q_AUTOTEST_EXPORT QDeclarativeVMEMetaObject : public QAbstractDynamicMetaObject, public QV8GCCallback::Node { @@ -161,6 +162,8 @@ protected: virtual int metaCall(QMetaObject::Call _c, int _id, void **_a); private: + friend class QDeclarativeVMEMetaObjectEndpoint; + QObject *object; QDeclarativeCompiledData *compiledData; QDeclarativeGuardedContextData ctxt; @@ -170,6 +173,7 @@ private: int methodOffset; QDeclarativeVMEVariant *data; + QDeclarativeVMEMetaObjectEndpoint *aliasEndpoints; v8::Persistent<v8::Array> varProperties; int firstVarPropertyIndex; |