Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (33 commits)
  Use QTRY_COMPARE to give the animation a chance to finish
  Cocoa: Sheets loose their opacity on 2nd show
  Added function overload for QByteArray &QByteArray::replace()
  Second attempt at work-around for MSVC2008 compiler crash
  QNativeSocketEngine: Fix some error handling related to waitFor*()
  qdoc:	List new QML elements in \sincelist for What's New page.
  Cocoa: fix namespace build
  Cocoa: Fix build with namespace
  Cocoa: namespace build fix
  doc:	Fixed some qdoc errors.
  Don't include private headers from public headers.
  Fix compilation on HP-UXi: m_volume is a #define
  WinCE doesn't have sys/types.h
  Fix compilation: qmlviewer cannot use symbols exported with Q_AUTOTEST_EXPORT in production builds
  Fix compilation on recent Linux systems: getpid(2) is in unistd.h.
  Cocoa: calling QEventLoop::exec from mouse up causes problem
  Fix compilation on GNU/Hurd (SA_SIGINFO isn't defined)
  Doc: Collected the Declarative UI tutorials together and renamed them.
  Doc: Simplified Commercial Editions for Qt 4.7.
  Work around MSVC2008 compiler crash
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/src/script/bridge/qscriptclassobject.cpp b/src/script/bridge/qscriptclassobject.cpp
index a3dd239..ce0a08e 100644
--- a/src/script/bridge/qscriptclassobject.cpp
+++ b/src/script/bridge/qscriptclassobject.cpp
@@ -206,7 +206,7 @@ JSC::JSValue JSC_HOST_CALL ClassObjectDelegate::call(JSC::ExecState *exec, JSC::
     QVariant result = scriptClass->extension(QScriptClass::Callable, qVariantFromValue(ctx));
     eng_p->popContext();
     eng_p->currentFrame = oldFrame;
-    return eng_p->jscValueFromVariant(result);
+    return QScriptEnginePrivate::jscValueFromVariant(exec, result);
 }
 
 JSC::ConstructType ClassObjectDelegate::getConstructData(QScriptObject*, JSC::ConstructData &constructData)