summaryrefslogtreecommitdiffstats
path: root/src/script/api/qscriptengine_p.h
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-08-06 12:13:21 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-08-06 12:13:21 (GMT)
commitbc83b5856416e5927822ee3e758d231fc9f43c38 (patch)
tree4992a1b11637fd2cb94613d5d2a53238acf9f8b4 /src/script/api/qscriptengine_p.h
parent319a6c0da5461c18537979e5df850db87765d302 (diff)
downloadQt-bc83b5856416e5927822ee3e758d231fc9f43c38.zip
Qt-bc83b5856416e5927822ee3e758d231fc9f43c38.tar.gz
Qt-bc83b5856416e5927822ee3e758d231fc9f43c38.tar.bz2
port commit 47c9e7b1b3551ff6dbe71590461a45ae398a9501 from qt/master
Diffstat (limited to 'src/script/api/qscriptengine_p.h')
-rw-r--r--src/script/api/qscriptengine_p.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/script/api/qscriptengine_p.h b/src/script/api/qscriptengine_p.h
index 614341b..77c4561 100644
--- a/src/script/api/qscriptengine_p.h
+++ b/src/script/api/qscriptengine_p.h
@@ -178,18 +178,20 @@ public:
void emitSignalHandlerException();
bool scriptConnect(QObject *sender, const char *signal,
- JSC::JSValue receiver, JSC::JSValue function);
+ JSC::JSValue receiver, JSC::JSValue function,
+ Qt::ConnectionType type);
bool scriptDisconnect(QObject *sender, const char *signal,
JSC::JSValue receiver, JSC::JSValue function);
bool scriptConnect(QObject *sender, int index,
JSC::JSValue receiver, JSC::JSValue function,
- JSC::JSValue senderWrapper = 0);
+ JSC::JSValue senderWrapper,
+ Qt::ConnectionType type);
bool scriptDisconnect(QObject *sender, int index,
JSC::JSValue receiver, JSC::JSValue function);
bool scriptConnect(JSC::JSValue signal, JSC::JSValue receiver,
- JSC::JSValue function);
+ JSC::JSValue function, Qt::ConnectionType type);
bool scriptDisconnect(JSC::JSValue signal, JSC::JSValue receiver,
JSC::JSValue function);