summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2011-05-04 12:43:20 +0200
committerOlivier Goffart <olivier.goffart@nokia.com>2011-05-04 12:43:20 +0200
commitbcbe1779ec39db954e25279c5a5b3a97e3f5b928 (patch)
tree69c521111fe6fedc37f01f961d3791827cba6176
parent7767d1e2fe6b0e5b679a2b3306ec51808668ee4d (diff)
parent6c80bf5249d997beb80d70aa701574226ab13f6e (diff)
Merge branch 'qtquick2-v8' of scm.dev.nokia.troll.no:qt/qt-script-v8 into qtquick2-v8history/qtquick2-v8
-rw-r--r--src/script/api/qscriptengine.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index d544b047ce..fbb6a80d0c 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -2540,7 +2540,7 @@ bool qScriptConnect(QObject *sender, const char *signal,
function.engine(), SLOT(_q_removeConnectedObject(QObject*)));
}
- QString signalName(signal);
+ QString signalName(QString::fromLatin1(signal));
signalName.remove(0, 1);
v8::Handle<v8::Object> signalData = v8Sender->Get(QScriptConverter::toString(signalName))->ToObject();
@@ -2576,7 +2576,7 @@ bool qScriptDisconnect(QObject *sender, const char *signal,
return false;
}
- QString signalName(signal);
+ QString signalName(QString::fromLatin1(signal));
signalName.remove(0, 1);
v8::Handle<v8::Object> signalData = v8Sender->Get(QScriptConverter::toString(signalName))->ToObject();