diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-12-14 13:01:13 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-12-14 13:01:13 (GMT) |
| commit | 086a010a63895c6e6d178c1de9434483f11b2d34 (patch) | |
| tree | bb2542f04438b42ae5c61b1c3a6330f011700474 /src/declarative/qml/qdeclarativevmemetaobject_p.h | |
| parent | 0fe36ac832abf8f8d438b21fce0177b65b3bbf3a (diff) | |
| parent | 5cb2226ddf96555417f08c9bfe35addfc93f6acd (diff) | |
| download | Qt-086a010a63895c6e6d178c1de9434483f11b2d34.zip Qt-086a010a63895c6e6d178c1de9434483f11b2d34.tar.gz Qt-086a010a63895c6e6d178c1de9434483f11b2d34.tar.bz2 | |
Merge branch 'qdoc-simplified' into mimir-simplified
Conflicts:
tools/qdoc3/atom.h
tools/qdoc3/qdoc3.pro
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); |