diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-07-15 22:30:14 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-07-15 22:30:14 (GMT) |
| commit | 50f400ac20e918db1d0a6496003d953dedaba42a (patch) | |
| tree | b1e03e544c0fd09f2070c5ebb95bd291b7dc39b2 /src/declarative/qml/qmlvmemetaobject.cpp | |
| parent | fe591031a8550a8a8c97fa08f0bdf8c2f9d4cf93 (diff) | |
| parent | bcae9d84fb5dd2bdc5a5298c8841702505a02867 (diff) | |
| download | Qt-50f400ac20e918db1d0a6496003d953dedaba42a.zip Qt-50f400ac20e918db1d0a6496003d953dedaba42a.tar.gz Qt-50f400ac20e918db1d0a6496003d953dedaba42a.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlvmemetaobject.cpp')
| -rw-r--r-- | src/declarative/qml/qmlvmemetaobject.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/declarative/qml/qmlvmemetaobject.cpp b/src/declarative/qml/qmlvmemetaobject.cpp index 6d14689..33a31a4 100644 --- a/src/declarative/qml/qmlvmemetaobject.cpp +++ b/src/declarative/qml/qmlvmemetaobject.cpp @@ -53,12 +53,9 @@ QT_BEGIN_NAMESPACE QmlVMEMetaObject::QmlVMEMetaObject(QObject *obj, const QMetaObject *other, - QList<QString> *strData, - int slotData, const QmlVMEMetaData *meta, QmlRefCount *rc) -: object(obj), ref(rc), metaData(meta), slotData(strData), - slotDataIdx(slotData), parent(0) +: object(obj), ref(rc), metaData(meta), parent(0) { if (ref) ref->addref(); @@ -208,7 +205,11 @@ int QmlVMEMetaObject::metaCall(QMetaObject::Call c, int _id, void **a) id -= plainSignals; if (id < metaData->methodCount) { - QString code = slotData->at(id + slotDataIdx); + QmlVMEMetaData::MethodData *data = metaData->methodData() + id; + const QChar *body = + (const QChar *)(((const char*)metaData) + data->bodyOffset); + + QString code = QString::fromRawData(body, data->bodyLength); QmlContext *ctxt = qmlContext(object); if (0 == (metaData->methodData() + id)->parameterCount) { |