diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-16 00:00:11 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-16 00:00:11 (GMT) |
| commit | 70e9090b13f828b048caadf305d405bdf9098d70 (patch) | |
| tree | ee41264c5c0766786313261049a3fa5c70578906 /src/script/api/qscriptvalue.cpp | |
| parent | 2e36c20f3039b94b02b49567edf4470fe73cceb8 (diff) | |
| parent | b36e357b982ba01cbf905fb1d0340e87030b0a95 (diff) | |
| download | Qt-70e9090b13f828b048caadf305d405bdf9098d70.zip Qt-70e9090b13f828b048caadf305d405bdf9098d70.tar.gz Qt-70e9090b13f828b048caadf305d405bdf9098d70.tar.bz2 | |
Merge branch 'master-upstream' into master-water
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 e6c3801..8cd4057 100644 --- a/src/script/api/qscriptvalue.cpp +++ b/src/script/api/qscriptvalue.cpp @@ -2026,6 +2026,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)); |