diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-01 13:48:41 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-02 00:54:54 (GMT) |
| commit | ecd07750a74111ed9ef65a7439ddccc065c5dadc (patch) | |
| tree | 96422a2eca0a2ad2900027ee34df251a7a96890b /src/declarative/qml/qmlvmemetaobject.cpp | |
| parent | 5118020e63f5e634a74082c417362d735a7a2303 (diff) | |
| download | Qt-ecd07750a74111ed9ef65a7439ddccc065c5dadc.zip Qt-ecd07750a74111ed9ef65a7439ddccc065c5dadc.tar.gz Qt-ecd07750a74111ed9ef65a7439ddccc065c5dadc.tar.bz2 | |
Add parameterized synthesized signals
Also changed syntax for emitting a signal to be consistent with normal QtScript.
Diffstat (limited to 'src/declarative/qml/qmlvmemetaobject.cpp')
| -rw-r--r-- | src/declarative/qml/qmlvmemetaobject.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlvmemetaobject.cpp b/src/declarative/qml/qmlvmemetaobject.cpp index 3b784a4..ec269b8 100644 --- a/src/declarative/qml/qmlvmemetaobject.cpp +++ b/src/declarative/qml/qmlvmemetaobject.cpp @@ -168,7 +168,10 @@ int QmlVMEMetaObject::metaCall(QMetaObject::Call c, int id, void **a) return id; } } else if(c == QMetaObject::InvokeMetaMethod) { - if(id >= baseSlot && id < (baseSlot + slotCount)) { + if (id >= baseSig && (baseSlot == -1 || id < baseSlot)) { + QMetaObject::activate(object, id, a); + return id; + } else if (id >= baseSlot && id < (baseSlot + slotCount)) { int idx = id - baseSlot + slotDataIdx; QmlContext *ctxt = qmlContext(object); QmlExpression expr(ctxt, slotData->at(idx), object); |