diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-12-01 07:36:41 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-12-01 07:36:41 (GMT) |
| commit | a305814f8f59f634943d8d5f8d87d2fd49891cb3 (patch) | |
| tree | 42ed4e6afecbf36af2750e2eeaed87117ab942a6 /src/declarative/qml/qdeclarativevmemetaobject_p.h | |
| parent | 6258fc281f5b66b2634b81a2633b117165cea7ef (diff) | |
| parent | 1337a3e031477aa4d628d01252557dee622629ff (diff) | |
| download | Qt-a305814f8f59f634943d8d5f8d87d2fd49891cb3.zip Qt-a305814f8f59f634943d8d5f8d87d2fd49891cb3.tar.gz Qt-a305814f8f59f634943d8d5f8d87d2fd49891cb3.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11
Diffstat (limited to 'src/declarative/qml/qdeclarativevmemetaobject_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativevmemetaobject_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativevmemetaobject_p.h b/src/declarative/qml/qdeclarativevmemetaobject_p.h index 5134763..7b6b410 100644 --- a/src/declarative/qml/qdeclarativevmemetaobject_p.h +++ b/src/declarative/qml/qdeclarativevmemetaobject_p.h @@ -138,6 +138,7 @@ public: QDeclarativeCompiledData *compiledData); ~QDeclarativeVMEMetaObject(); + bool aliasTarget(int index, QObject **target, int *coreIndex, int *valueTypeIndex) const; void registerInterceptor(int index, int valueIndex, QDeclarativePropertyValueInterceptor *interceptor); QScriptValue vmeMethod(int index); int vmeMethodLineNumber(int index); @@ -146,6 +147,7 @@ public: void setVMEProperty(int index, const QScriptValue &); void connectAliasSignal(int index); + protected: virtual int metaCall(QMetaObject::Call _c, int _id, void **_a); |