summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKent Hansen <kent.hansen@nokia.com>2010-03-26 11:24:00 (GMT)
committerKent Hansen <kent.hansen@nokia.com>2010-03-26 11:26:45 (GMT)
commit9a7dd6c047a8eebad94fd5f3e9fc2284c315b046 (patch)
tree10f740f8d2ef62ebb17958cb9a7a0873fa8451b9
parent7d5e8f7ff741b45d0114ea45d81c8d90118d65ab (diff)
downloadQt-9a7dd6c047a8eebad94fd5f3e9fc2284c315b046.zip
Qt-9a7dd6c047a8eebad94fd5f3e9fc2284c315b046.tar.gz
Qt-9a7dd6c047a8eebad94fd5f3e9fc2284c315b046.tar.bz2
QtScript: Add missing API shim for signal handling
The signal handling bypasses the public QScriptValue API (it calls JSC::call() directly), hence we need to insert a shim to make sure that the correct identifier table will be used.
-rw-r--r--src/script/bridge/qscriptqobject.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/script/bridge/qscriptqobject.cpp b/src/script/bridge/qscriptqobject.cpp
index 83a811b..0477454 100644
--- a/src/script/bridge/qscriptqobject.cpp
+++ b/src/script/bridge/qscriptqobject.cpp
@@ -2074,6 +2074,7 @@ void QObjectConnectionManager::execute(int slotIndex, void **argv)
JSC::JSValue slot;
JSC::JSValue senderWrapper;
int signalIndex = -1;
+ QScript::APIShim shim(engine);
for (int i = 0; i < connections.size(); ++i) {
const QVector<QObjectConnection> &cs = connections.at(i);
for (int j = 0; j < cs.size(); ++j) {