diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-06 12:13:21 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-06 12:13:21 (GMT) |
| commit | bc83b5856416e5927822ee3e758d231fc9f43c38 (patch) | |
| tree | 4992a1b11637fd2cb94613d5d2a53238acf9f8b4 /src/script/bridge | |
| parent | 319a6c0da5461c18537979e5df850db87765d302 (diff) | |
| download | Qt-bc83b5856416e5927822ee3e758d231fc9f43c38.zip Qt-bc83b5856416e5927822ee3e758d231fc9f43c38.tar.gz Qt-bc83b5856416e5927822ee3e758d231fc9f43c38.tar.bz2 | |
port commit 47c9e7b1b3551ff6dbe71590461a45ae398a9501 from qt/master
Diffstat (limited to 'src/script/bridge')
| -rw-r--r-- | src/script/bridge/qscriptqobject.cpp | 13 | ||||
| -rw-r--r-- | src/script/bridge/qscriptqobject_p.h | 3 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/script/bridge/qscriptqobject.cpp b/src/script/bridge/qscriptqobject.cpp index 892ca5b..e876cc9 100644 --- a/src/script/bridge/qscriptqobject.cpp +++ b/src/script/bridge/qscriptqobject.cpp @@ -141,7 +141,8 @@ public: bool addSignalHandler(QObject *sender, int signalIndex, JSC::JSValue receiver, JSC::JSValue slot, - JSC::JSValue senderWrapper = 0); + JSC::JSValue senderWrapper, + Qt::ConnectionType type); bool removeSignalHandler(QObject *sender, int signalIndex, JSC::JSValue receiver, JSC::JSValue slot); @@ -2090,13 +2091,14 @@ void QObjectConnectionManager::mark() bool QObjectConnectionManager::addSignalHandler( QObject *sender, int signalIndex, JSC::JSValue receiver, - JSC::JSValue function, JSC::JSValue senderWrapper) + JSC::JSValue function, JSC::JSValue senderWrapper, + Qt::ConnectionType type) { if (connections.size() <= signalIndex) connections.resize(signalIndex+1); QVector<QObjectConnection> &cs = connections[signalIndex]; int absSlotIndex = slotCounter + metaObject()->methodOffset(); - bool ok = QMetaObject::connect(sender, signalIndex, this, absSlotIndex); + bool ok = QMetaObject::connect(sender, signalIndex, this, absSlotIndex, type); if (ok) { cs.append(QObjectConnection(slotCounter++, receiver, function, senderWrapper)); QMetaMethod signal = sender->metaObject()->method(signalIndex); @@ -2168,12 +2170,13 @@ bool QObjectData::addSignalHandler(QObject *sender, int signalIndex, JSC::JSValue receiver, JSC::JSValue slot, - JSC::JSValue senderWrapper) + JSC::JSValue senderWrapper, + Qt::ConnectionType type) { if (!connectionManager) connectionManager = new QObjectConnectionManager(engine); return connectionManager->addSignalHandler( - sender, signalIndex, receiver, slot, senderWrapper); + sender, signalIndex, receiver, slot, senderWrapper, type); } bool QObjectData::removeSignalHandler(QObject *sender, diff --git a/src/script/bridge/qscriptqobject_p.h b/src/script/bridge/qscriptqobject_p.h index cce585f..72e5028 100644 --- a/src/script/bridge/qscriptqobject_p.h +++ b/src/script/bridge/qscriptqobject_p.h @@ -168,7 +168,8 @@ public: int signalIndex, JSC::JSValue receiver, JSC::JSValue slot, - JSC::JSValue senderWrapper = 0); + JSC::JSValue senderWrapper, + Qt::ConnectionType type); bool removeSignalHandler(QObject *sender, int signalIndex, JSC::JSValue receiver, |