diff options
| author | juhvu <qt-info@nokia.com> | 2010-11-10 03:54:39 (GMT) |
|---|---|---|
| committer | juhvu <qt-info@nokia.com> | 2010-11-10 03:54:39 (GMT) |
| commit | 2c7bab684fa9684175b9a6c913a20a76f3502d08 (patch) | |
| tree | a69572bf525aae044a96820129f24bc63124fd07 /src/script/api/qscriptvalue.cpp | |
| parent | a55c13c52822f337cc4ad708881fd54d3a1bbb1d (diff) | |
| parent | 2ec60d5a71a560460c884be36de8fbad467fb69d (diff) | |
| download | Qt-2c7bab684fa9684175b9a6c913a20a76f3502d08.zip Qt-2c7bab684fa9684175b9a6c913a20a76f3502d08.tar.gz Qt-2c7bab684fa9684175b9a6c913a20a76f3502d08.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/script/api/qscriptvalue.cpp')
| -rw-r--r-- | src/script/api/qscriptvalue.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/script/api/qscriptvalue.cpp b/src/script/api/qscriptvalue.cpp index f494106..e40458b 100644 --- a/src/script/api/qscriptvalue.cpp +++ b/src/script/api/qscriptvalue.cpp @@ -2036,6 +2036,7 @@ void QScriptValue::setData(const QScriptValue &data) Q_D(QScriptValue); if (!d || !d->isObject()) return; + QScript::APIShim shim(d->engine); JSC::JSValue other = d->engine->scriptValueToJSCValue(data); if (d->jscValue.inherits(&QScriptObject::info)) { QScriptObject *scriptObject = static_cast<QScriptObject*>(JSC::asObject(d->jscValue)); |