diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-03-24 16:38:26 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-03-31 14:32:45 (GMT) |
| commit | 6fcd431d04cf7416179d5ab30f656a6ce3926070 (patch) | |
| tree | dc0c234fb4b1dd75610a4a61661d1178fffe081c /src/declarative/qml | |
| parent | a1a141e4af6226dca9ae67c51dd5e14cb3393772 (diff) | |
| download | Qt-6fcd431d04cf7416179d5ab30f656a6ce3926070.zip Qt-6fcd431d04cf7416179d5ab30f656a6ce3926070.tar.gz Qt-6fcd431d04cf7416179d5ab30f656a6ce3926070.tar.bz2 | |
Fix declarative after the last changes to the QObject internals
Diffstat (limited to 'src/declarative/qml')
| -rw-r--r-- | src/declarative/qml/qmetaobjectbuilder.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/qml/qmetaobjectbuilder_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qmetaobjectbuilder.cpp b/src/declarative/qml/qmetaobjectbuilder.cpp index 6a0226f..dc941e2 100644 --- a/src/declarative/qml/qmetaobjectbuilder.cpp +++ b/src/declarative/qml/qmetaobjectbuilder.cpp @@ -791,7 +791,7 @@ void QMetaObjectBuilder::addMetaObject } if ((members & StaticMetacall) != 0) { - if (priv(prototype->d.data)->revision >= 2) { + if (priv(prototype->d.data)->revision >= 6) { const QMetaObjectExtraData *extra = (const QMetaObjectExtraData *)(prototype->d.extradata); if (extra && extra->static_metacall) diff --git a/src/declarative/qml/qmetaobjectbuilder_p.h b/src/declarative/qml/qmetaobjectbuilder_p.h index 2678bff..d7085f8 100644 --- a/src/declarative/qml/qmetaobjectbuilder_p.h +++ b/src/declarative/qml/qmetaobjectbuilder_p.h @@ -169,7 +169,7 @@ public: int indexOfEnumerator(const QByteArray& name); int indexOfClassInfo(const QByteArray& name); - typedef int (*StaticMetacallFunction)(QMetaObject::Call, int, void **); + typedef QMetaObjectExtraData::StaticMetacallFunction StaticMetacallFunction; QMetaObjectBuilder::StaticMetacallFunction staticMetacallFunction() const; void setStaticMetacallFunction(QMetaObjectBuilder::StaticMetacallFunction value); |