Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (243 commits)
  Fix compilation after merge.
  SSL: Fix for capabilities in QSslCertificate auto test
  Doc: update symbian capabilities regarding SSL
  SSL: Fix crashes/hangs when retrieving CA certificates
  Doc: Fixing typo
  Coding style: bang cleanup.
  Removed call to glFinish, obsoleted by fence syncs.
  Helper-side support for QMeeGoFenceSync.
  Plugin-side support for creating/destroying/waiting on fence sync.
  Added MeeGo graphicssystem entry points for KHR_fence_sync.
  Trailing whitespace fixes.
  remove pointless assignment of deprecated variable
  QDeclarativeDebug: Keep source information when changing an expression
  Fix auto-test regression in tst_QDoubleValidator
  Fixed tst_qpixmap::grabWidget autotest failure on QWS.
  Use $${EPOCROOT} variable rather than absolute paths in .pro files
  fix tst_headers
  Fixed a shell syntax error in configure
  Flickable does not reposition its content when it is resized.
  Document that Transitions are exclusive.
  ...

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));