Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt

Conflicts:
	src/network/socket/qlocalsocket.cpp

1 files changed, 9 insertions, 6 deletions

diff --git a/src/script/qscriptengine_p.cpp b/src/script/qscriptengine_p.cpp
index 0a238bc..ffb5a27 100644
--- a/src/script/qscriptengine_p.cpp
+++ b/src/script/qscriptengine_p.cpp
@@ -2312,7 +2312,8 @@ void QScriptEnginePrivate::deletePendingQObjects()
 
 bool QScriptEnginePrivate::scriptConnect(QObject *sender, const char *signal,
                                          const QScriptValueImpl &receiver,
-                                         const QScriptValueImpl &function)
+                                         const QScriptValueImpl &function,
+                                         Qt::ConnectionType type)
 {
     Q_ASSERT(sender);
     Q_ASSERT(signal);
@@ -2320,7 +2321,7 @@ bool QScriptEnginePrivate::scriptConnect(QObject *sender, const char *signal,
     int index = meta->indexOfSignal(QMetaObject::normalizedSignature(signal+1));
     if (index == -1)
         return false;
-    return scriptConnect(sender, index, receiver, function);
+    return scriptConnect(sender, index, receiver, function, /*wrapper=*/QScriptValueImpl(), type);
 }
 
 bool QScriptEnginePrivate::scriptDisconnect(QObject *sender, const char *signal,
@@ -2339,10 +2340,11 @@ bool QScriptEnginePrivate::scriptDisconnect(QObject *sender, const char *signal,
 bool QScriptEnginePrivate::scriptConnect(QObject *sender, int signalIndex,
                                          const QScriptValueImpl &receiver,
                                          const QScriptValueImpl &function,
-                                         const QScriptValueImpl &senderWrapper)
+                                         const QScriptValueImpl &senderWrapper,
+                                         Qt::ConnectionType type)
 {
     QScriptQObjectData *data = qobjectData(sender);
-    return data->addSignalHandler(sender, signalIndex, receiver, function, senderWrapper);
+    return data->addSignalHandler(sender, signalIndex, receiver, function, senderWrapper, type);
 }
 
 bool QScriptEnginePrivate::scriptDisconnect(QObject *sender, int signalIndex,
@@ -2357,11 +2359,12 @@ bool QScriptEnginePrivate::scriptDisconnect(QObject *sender, int signalIndex,
 
 bool QScriptEnginePrivate::scriptConnect(const QScriptValueImpl &signal,
                                          const QScriptValueImpl &receiver,
-                                         const QScriptValueImpl &function)
+                                         const QScriptValueImpl &function,
+                                         Qt::ConnectionType type)
 {
     QScript::QtFunction *fun = static_cast<QScript::QtFunction*>(signal.toFunction());
     int index = fun->mostGeneralMethod();
-    return scriptConnect(fun->qobject(), index, receiver, function, fun->object());
+    return scriptConnect(fun->qobject(), index, receiver, function, fun->object(), type);
 }
 
 bool QScriptEnginePrivate::scriptDisconnect(const QScriptValueImpl &signal,