Changeset 846 for trunk/src/script/api

trunk

Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.7.2 (added) merged: 845
/branches/vendor/nokia/qt/current merged: 844
/branches/vendor/nokia/qt/4.6.3 removed

trunk/src/script/api/qscriptable.cpp

r651	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/script/api/qscriptable.h

r651	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/script/api/qscriptable_p.h

r651	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/script/api/qscriptclass.cpp

r651	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/script/api/qscriptclass.h

r651	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/script/api/qscriptclasspropertyiterator.cpp

r651	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/script/api/qscriptclasspropertyiterator.h

r651	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/script/api/qscriptcontext.cpp

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
+{
     JSC::CallFrame *frame = QScriptEnginePrivate::frameForContext(this);
+    QScript::APIShim shim(QScript::scriptEngineFromExec(frame));
     JSC::JSValue jscValue = QScript::scriptEngineFromExec(frame)->scriptValueToJSCValue(value);
     frame->setException(jscValue);
 …
+{
     JSC::CallFrame *frame = QScriptEnginePrivate::frameForContext(this);
+    QScript::APIShim shim(QScript::scriptEngineFromExec(frame));
     JSC::ErrorType jscError = JSC::GeneralError;
     switch (error) {
 …
+{
     JSC::CallFrame *frame = QScriptEnginePrivate::frameForContext(this);
+    QScript::APIShim shim(QScript::scriptEngineFromExec(frame));
     JSC::JSObject *result = JSC::throwError(frame, JSC::GeneralError, text);
     return QScript::scriptEngineFromExec(frame)->scriptValueFromJSCValue(result);
 …
+{
     const JSC::CallFrame *frame = QScriptEnginePrivate::frameForContext(this);
+    QScript::APIShim shim(QScript::scriptEngineFromExec(frame));
     return QScript::scriptEngineFromExec(frame)->scriptValueFromJSCValue(frame->callee());
+}
 …
+{
     JSC::CallFrame *frame = const_cast<JSC::ExecState*>(QScriptEnginePrivate::frameForContext(this));
+    QScript::APIShim shim(QScript::scriptEngineFromExec(frame));
     if (frame == frame->lexicalGlobalObject()->globalExec()) {
 …
     //for a js function
     if (frame->codeBlock() && frame->callee()) {
+        if (!QScriptEnginePrivate::hasValidCodeBlockRegister(frame)) {
+            // We have a built-in JS host call.
+            // codeBlock is needed by retrieveArguments(), but since it
+            // contains junk, we would crash. Return an invalid value for now.
+            return QScriptValue();
+        }
         JSC::JSValue result = frame->interpreter()->retrieveArguments(frame, JSC::asFunction(frame->callee()));
         return QScript::scriptEngineFromExec(frame)->scriptValueFromJSCValue(result);
 …
     //for a native function
+    if (!frame->optionalCalleeArguments()) {
+    if (!frame->optionalCalleeArguments()
+        && QScriptEnginePrivate::hasValidCodeBlockRegister(frame)) { // Make sure we don't go here for host JSFunctions
         Q_ASSERT(frame->argumentCount() > 0); //we need at least 'this' otherwise we'll crash later
         JSC::Arguments* arguments = new (&frame->globalData())JSC::Arguments(frame, JSC::Arguments::NoParameters);
 …
   When a function is called as constructor, the thisObject()
   contains the newly constructed object to be initialized.
+  \note This function is only guaranteed to work for a context
+  corresponding to native functions.
 */
 bool QScriptContext::isCalledAsConstructor() const
+{
     JSC::CallFrame *frame = const_cast<JSC::ExecState*>(QScriptEnginePrivate::frameForContext(this));
+    QScript::APIShim shim(QScript::scriptEngineFromExec(frame));
     //For native functions, look up flags.
 …
+{
     const JSC::CallFrame *frame = QScriptEnginePrivate::frameForContext(this);
+    QScript::APIShim shim(QScript::scriptEngineFromExec(frame));
     JSC::CallFrame *callerFrame = frame->callerFrame()->removeHostCallFrameFlag();
     return QScriptEnginePrivate::contextForFrame(callerFrame);
 …
   context.
+  \note The activation object might not be available if there is no
+  active QScriptEngineAgent, as it might be optimized.
   \sa argument(), argumentsObject()
 */
 …
+{
     JSC::CallFrame *frame = const_cast<JSC::ExecState*>(QScriptEnginePrivate::frameForContext(this));
+    QScript::APIShim shim(QScript::scriptEngineFromExec(frame));
     JSC::JSObject *result = 0;
 …
   If \a activation is not an object, this function does nothing.
+  \note For a context corresponding to a JavaScript function, this is only
+  guaranteed to work if there was an QScriptEngineAgent active on the
+  engine while the function was evaluated.
 */
 void QScriptContext::setActivationObject(const QScriptValue &activation)
 …
     JSC::CallFrame *frame = QScriptEnginePrivate::frameForContext(this);
     QScriptEnginePrivate *engine = QScript::scriptEngineFromExec(frame);
+    QScript::APIShim shim(engine);
     JSC::JSObject *object = JSC::asObject(engine->scriptValueToJSCValue(activation));
     if (object == engine->originalGlobalObjectProxy)
 …
     JSC::CallFrame *frame = const_cast<JSC::ExecState*>(QScriptEnginePrivate::frameForContext(this));
     QScriptEnginePrivate *engine = QScript::scriptEngineFromExec(frame);
+    QScript::APIShim shim(engine);
     JSC::JSValue result = engine->thisForContext(frame);
     if (!result || result.isNull())
 …
+{
     JSC::CallFrame *frame = QScriptEnginePrivate::frameForContext(this);
+    QScript::APIShim shim(QScript::scriptEngineFromExec(frame));
     if (!thisObject.isObject())
         return;
 …
     const JSC::CallFrame *frame = QScriptEnginePrivate::frameForContext(this);
     QScriptEnginePrivate *engine = QScript::scriptEngineFromExec(frame);
+    QScript::APIShim shim(engine);
     QScriptValueList result;
     JSC::ScopeChainNode *node = frame->scopeChain();
 …
     JSC::CallFrame *frame = QScriptEnginePrivate::frameForContext(this);
     QScriptEnginePrivate *engine = QScript::scriptEngineFromExec(frame);
+    QScript::APIShim shim(engine);
     JSC::JSObject *jscObject = JSC::asObject(engine->scriptValueToJSCValue(object));
     if (jscObject == engine->originalGlobalObjectProxy)
 …
 QScriptValue QScriptContext::popScope()
+{
+    activationObject(); //ensure the creation of the normal scope for native context
     JSC::CallFrame *frame = QScriptEnginePrivate::frameForContext(this);
     JSC::ScopeChainNode *scope = frame->scopeChain();
     Q_ASSERT(scope != 0);
     QScriptEnginePrivate *engine = QScript::scriptEngineFromExec(frame);
+    QScript::APIShim shim(engine);
     QScriptValue result = engine->scriptValueFromJSCValue(scope->object);
     if (!scope->next) {

trunk/src/script/api/qscriptcontext.h

r651	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/script/api/qscriptcontext_p.h

r651	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/script/api/qscriptcontextinfo.cpp

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
   If the called function is executing Qt Script code, you can obtain
+  the script location with the functions fileName(), lineNumber() and
+  columnNumber().
+  the script location with the functions fileName() and lineNumber().
   You can obtain the starting line number and ending line number of a
 …
             JSC::Instruction *returnPC = rewindContext->returnPC();
             JSC::CodeBlock *codeBlock = frame->codeBlock();
             if (returnPC && codeBlock) {
+            if (returnPC && codeBlock && QScriptEnginePrivate::hasValidCodeBlockRegister(frame)) {
 #if ENABLE(JIT)
                 unsigned bytecodeOffset = codeBlock->getBytecodeIndex(frame, JSC::ReturnAddressPtr(returnPC));
 …
     // Get the filename and the scriptId:
     JSC::CodeBlock *codeBlock = frame->codeBlock();
     if (codeBlock) {
+    if (codeBlock && QScriptEnginePrivate::hasValidCodeBlockRegister(frame)) {
            JSC::SourceProvider *source = codeBlock->source();
            scriptId = source->asID();
 …
+    }
     // Get the others informations:
+    // Get the others information:
     JSC::JSObject *callee = frame->callee();
     if (callee && callee->inherits(&JSC::InternalFunction::info))
+        functionName = JSC::asInternalFunction(callee)->name(&frame->globalData());
+    if (callee && callee->inherits(&JSC::JSFunction::info)) {
+        functionName = JSC::asInternalFunction(callee)->name(frame);
+    if (callee && callee->inherits(&JSC::JSFunction::info)
+        && !JSC::asFunction(callee)->isHostFunction()) {
         functionType = QScriptContextInfo::ScriptFunction;
         JSC::FunctionExecutable *body = JSC::asFunction(callee)->jsExecutable();
 …
 /*!
+  Returns the column number corresponding to the statement being
+  executed, or -1 if the column number is not available.
+  The column number is only available if Qt Script code is being
+  executed.
+  \sa lineNumber(), fileName()
+  \obsolete
 */
 int QScriptContextInfo::columnNumber() const

trunk/src/script/api/qscriptcontextinfo.h

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
     QString fileName() const;
     int lineNumber() const;
+    int columnNumber() const;
+#ifdef QT_DEPRECATED
+    QT_DEPRECATED int columnNumber() const;
+#endif
     QString functionName() const;

trunk/src/script/api/qscriptengine.cpp

-              r769
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
 #include "qscriptengine.h"
 #include "qscriptsyntaxchecker_p.h"
-#include "qnumeric.h"
 #include "qscriptengine_p.h"
 …
 #include <QtCore/qmetaobject.h>
+#include <math.h>
 #include "CodeBlock.h"
 #include "Error.h"
-#include "JSArray.h"
-#include "JSLock.h"
 #include "Interpreter.h"
+#include "DateConstructor.h"
+#include "RegExpConstructor.h"
+#include "ExceptionHelpers.h"
 #include "PrototypeFunction.h"
 #include "InitializeThreading.h"
 …
 #include "JSFunction.h"
 #include "Parser.h"
+#include "PropertyNameArray.h"
 #include "Operations.h"
-#include "utils/qscriptdate_p.h"
 #include "bridge/qscriptfunction_p.h"
-#include "bridge/qscriptobject_p.h"
 #include "bridge/qscriptclassobject_p.h"
 #include "bridge/qscriptvariant_p.h"
 …
 #include "bridge/qscriptglobalobject_p.h"
 #include "bridge/qscriptactivationobject_p.h"
+#include "bridge/qscriptstaticscopeobject_p.h"
 #ifndef QT_NO_QOBJECT
 …
   that case, you can call toString() on the error object to obtain an
   error message. The current uncaught exception is also available
+  through uncaughtException(). You can obtain a human-readable
+  backtrace of the exception with uncaughtExceptionBacktrace().
+  through uncaughtException().
   Calling clearExceptions() will cause any uncaught exceptions to be
   cleared.
 …
   isEvaluating().
+  \section1 Garbage Collection
+  Qt Script objects may be garbage collected when they are no longer
+  referenced. There is no guarantee as to when automatic garbage
+  collection will take place.
+  The collectGarbage() function can be called to explicitly request
+  garbage collection.
+  The reportAdditionalMemoryCost() function can be called to indicate
+  that a Qt Script object occupies memory that isn't managed by the
+  scripting environment. Reporting the additional cost makes it more
+  likely that the garbage collector will be triggered. This can be
+  useful, for example, when many custom, native Qt Script objects are
+  allocated.
   \section1 Core Debugging/Tracing Facilities
 …
     This enum specifies the ownership when wrapping a C++ value, e.g. by using newQObject().
+    \value QtOwnership The standard Qt ownership rules apply, i.e. the associated object will never be explicitly deleted by the script engine. This is the default. (QObject ownership is explained in \l{Object Trees and Object Ownership}.)
+    \value ScriptOwnership The value is owned by the script environment. The associated data will be deleted when appropriate (i.e. after the garbage collector has discovered that there are no more live references to the value).
+    \value AutoOwnership If the associated object has a parent, the Qt ownership rules apply (QtOwnership); otherwise, the object is owned by the script environment (ScriptOwnership).
+    \value QtOwnership The standard Qt ownership rules apply, i.e. the
+    associated object will never be explicitly deleted by the script
+    engine. This is the default. (QObject ownership is explained in
+    \l{Object Trees & Ownership}.)
+    \value ScriptOwnership The value is owned by the script
+    environment. The associated data will be deleted when appropriate
+    (i.e. after the garbage collector has discovered that there are no
+    more live references to the value).
+    \value AutoOwnership If the associated object has a parent, the Qt
+    ownership rules apply (QtOwnership); otherwise, the object is
+    owned by the script environment (ScriptOwnership).
 */
 …
     \value ExcludeSuperClassContents Shorthand form for ExcludeSuperClassMethods | ExcludeSuperClassProperties
     \value ExcludeDeleteLater The script object will not expose the QObject::deleteLater() slot.
+    \value ExcludeSlots The script object will not expose the QObject's slots.
     \value AutoCreateDynamicProperties Properties that don't already exist in the QObject will be created as dynamic properties of that object, rather than as properties of the script object.
     \value PreferExistingWrapperObject If a wrapper object with the requested configuration already exists, return that object.
 …
 namespace QScript
+{
+static const qsreal D32 = 4294967296.0;
+qint32 ToInt32(qsreal n)
+{
+    if (qIsNaN(n) || qIsInf(n) || (n == 0))
+        return 0;
+    qsreal sign = (n < 0) ? -1.0 : 1.0;
+    qsreal abs_n = fabs(n);
+    n = ::fmod(sign * ::floor(abs_n), D32);
+    const double D31 = D32 / 2.0;
+    if (sign == -1 && n < -D31)
+        n += D32;
+    else if (sign != -1 && n >= D31)
+        n -= D32;
+    return qint32 (n);
+}
+quint32 ToUInt32(qsreal n)
+{
+    if (qIsNaN(n) || qIsInf(n) || (n == 0))
+        return 0;
+    qsreal sign = (n < 0) ? -1.0 : 1.0;
+    qsreal abs_n = fabs(n);
+    n = ::fmod(sign * ::floor(abs_n), D32);
+    if (n < 0)
+        n += D32;
+    return quint32 (n);
+}
+quint16 ToUInt16(qsreal n)
+{
+    static const qsreal D16 = 65536.0;
+    if (qIsNaN(n) || qIsInf(n) || (n == 0))
+        return 0;
+    qsreal sign = (n < 0) ? -1.0 : 1.0;
+    qsreal abs_n = fabs(n);
+    n = ::fmod(sign * ::floor(abs_n), D16);
+    if (n < 0)
+        n += D16;
+    return quint16 (n);
+}
+qsreal ToInteger(qsreal n)
+{
+    if (qIsNaN(n))
+        return 0;
+    if (n == 0 || qIsInf(n))
+        return n;
+    int sign = n < 0 ? -1 : 1;
+    return sign * ::floor(::fabs(n));
+}
+#ifdef Q_CC_MSVC
+// MSVC2008 crashes if these are inlined.
+QString ToString(qsreal value)
+{
+    return JSC::UString::from(value);
+}
+qsreal ToNumber(const QString &value)
+{
+    return ((JSC::UString)value).toDouble();
+}
+#endif
+static const qsreal MsPerSecond = 1000.0;
+static inline int MsFromTime(qsreal t)
+{
+    int r = int(::fmod(t, MsPerSecond));
+    return (r >= 0) ? r : r + int(MsPerSecond);
+}
+/*!
+  \internal
+  Converts a JS date value (milliseconds) to a QDateTime (local time).
+*/
+QDateTime MsToDateTime(JSC::ExecState *exec, qsreal t)
+{
+    if (qIsNaN(t))
+        return QDateTime();
+    JSC::GregorianDateTime tm;
+    JSC::msToGregorianDateTime(exec, t, /*output UTC=*/true, tm);
+    int ms = MsFromTime(t);
+    QDateTime convertedUTC = QDateTime(QDate(tm.year + 1900, tm.month + 1, tm.monthDay),
+                                       QTime(tm.hour, tm.minute, tm.second, ms), Qt::UTC);
+    return convertedUTC.toLocalTime();
+}
+/*!
+  \internal
+  Converts a QDateTime to a JS date value (milliseconds).
+*/
+qsreal DateTimeToMs(JSC::ExecState *exec, const QDateTime &dt)
+{
+    if (!dt.isValid())
+        return qSNaN();
+    QDateTime utc = dt.toUTC();
+    QDate date = utc.date();
+    QTime time = utc.time();
+    JSC::GregorianDateTime tm;
+    tm.year = date.year() - 1900;
+    tm.month = date.month() - 1;
+    tm.monthDay = date.day();
+    tm.weekDay = date.dayOfWeek();
+    tm.yearDay = date.dayOfYear();
+    tm.hour = time.hour();
+    tm.minute = time.minute();
+    tm.second = time.second();
+    return JSC::gregorianDateTimeToMS(exec, tm, time.msec(), /*inputIsUTC=*/true);
+}
 void GlobalClientData::mark(JSC::MarkStack& markStack)
 …
             slot = arg1;
         else {
-            // ### don't go via QScriptValue
             QScript::SaveFrameHelper saveFrame(engine, exec);
+            QScriptValue tmp = engine->scriptValueFromJSCValue(arg0);
+            QString propertyName(arg1.toString(exec));
+            slot = engine->scriptValueToJSCValue(tmp.property(propertyName, QScriptValue::ResolvePrototype));
+            JSC::UString propertyName = QScriptEnginePrivate::toString(exec, arg1);
+            slot = QScriptEnginePrivate::property(exec, arg0, propertyName, QScriptValue::ResolvePrototype);
+        }
+    }
 …
             slot = arg1;
         else {
-            // ### don't go via QScriptValue
             QScript::SaveFrameHelper saveFrame(engine, exec);
+            QScriptValue tmp = engine->scriptValueFromJSCValue(arg0);
+            QString propertyName = arg1.toString(exec);
+            slot = engine->scriptValueToJSCValue(tmp.property(propertyName, QScriptValue::ResolvePrototype));
+            JSC::UString propertyName = QScriptEnginePrivate::toString(exec, arg1);
+            slot = QScriptEnginePrivate::property(exec, arg0, propertyName, QScriptValue::ResolvePrototype);
+        }
+    }
 …
 static JSC::JSValue JSC_HOST_CALL functionQsTr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&);
 static JSC::JSValue JSC_HOST_CALL functionQsTrNoOp(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&);
+static JSC::JSValue JSC_HOST_CALL functionQsTrId(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&);
+static JSC::JSValue JSC_HOST_CALL functionQsTrIdNoOp(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&);
 JSC::JSValue JSC_HOST_CALL functionQsTranslate(JSC::ExecState *exec, JSC::JSObject*, JSC::JSValue, const JSC::ArgList &args)
 …
         return JSC::throwError(exec, JSC::GeneralError, "qsTranslate(): fifth argument (n) must be a number");
 #ifndef QT_NO_QOBJECT
     QString context(args.at(0).toString(exec));
+    JSC::UString context = args.at(0).toString(exec);
 #endif
     QString text(args.at(1).toString(exec));
+    JSC::UString text = args.at(1).toString(exec);
 #ifndef QT_NO_QOBJECT
     QString comment;
+    JSC::UString comment;
     if (args.size() > 2)
         comment = args.at(2).toString(exec);
     QCoreApplication::Encoding encoding = QCoreApplication::CodecForTr;
     if (args.size() > 3) {
         QString encStr(args.at(3).toString(exec));
         if (encStr == QLatin1String("CodecForTr"))
+        JSC::UString encStr = args.at(3).toString(exec);
+        if (encStr == "CodecForTr")
             encoding = QCoreApplication::CodecForTr;
         else if (encStr == QLatin1String("UnicodeUTF8"))
+        else if (encStr == "UnicodeUTF8")
             encoding = QCoreApplication::UnicodeUTF8;
         else
 …
         n = args.at(4).toInt32(exec);
 #endif
     QString result;
+    JSC::UString result;
 #ifndef QT_NO_QOBJECT
     result = QCoreApplication::translate(context.toLatin1().constData(),
                                          text.toLatin1().constData(),
                                          comment.toLatin1().constData(),
+    result = QCoreApplication::translate(QScript::convertToLatin1(context).constData(),
+                                         QScript::convertToLatin1(text).constData(),
+                                         QScript::convertToLatin1(comment).constData(),
                                          encoding, n);
 #else
 …
         return JSC::throwError(exec, JSC::GeneralError, "qsTr(): third argument (n) must be a number");
 #ifndef QT_NO_QOBJECT
+    QString context;
+    QScriptEnginePrivate *engine = scriptEngineFromExec(exec);
+    JSC::UString context;
     // The first non-empty source URL in the call stack determines the translation context.
+    {
         JSC::ExecState *frame = exec->removeHostCallFrameFlag();
+        JSC::ExecState *frame = exec->callerFrame()->removeHostCallFrameFlag();
         while (frame) {
+            if (frame->codeBlock() && frame->codeBlock()->source()
+            if (frame->codeBlock() && QScriptEnginePrivate::hasValidCodeBlockRegister(frame)
+                && frame->codeBlock()->source()
                 && !frame->codeBlock()->source()->url().isEmpty()) {
                 context = QFileInfo(frame->codeBlock()->source()->url()).baseName();
+                context = engine->translationContextFromUrl(frame->codeBlock()->source()->url());
                 break;
+            }
 …
+    }
 #endif
     QString text(args.at(0).toString(exec));
+    JSC::UString text = args.at(0).toString(exec);
 #ifndef QT_NO_QOBJECT
     QString comment;
+    JSC::UString comment;
     if (args.size() > 1)
         comment = args.at(1).toString(exec);
 …
         n = args.at(2).toInt32(exec);
 #endif
     QString result;
+    JSC::UString result;
 #ifndef QT_NO_QOBJECT
     result = QCoreApplication::translate(context.toLatin1().constData(),
                                          text.toLatin1().constData(),
                                          comment.toLatin1().constData(),
+    result = QCoreApplication::translate(QScript::convertToLatin1(context).constData(),
+                                         QScript::convertToLatin1(text).constData(),
+                                         QScript::convertToLatin1(comment).constData(),
                                          QCoreApplication::CodecForTr, n);
 #else
 …
 JSC::JSValue JSC_HOST_CALL functionQsTrNoOp(JSC::ExecState *, JSC::JSObject*, JSC::JSValue, const JSC::ArgList &args)
+{
+    if (args.size() < 1)
+        return JSC::jsUndefined();
+    return args.at(0);
+}
+JSC::JSValue JSC_HOST_CALL functionQsTrId(JSC::ExecState *exec, JSC::JSObject*, JSC::JSValue, const JSC::ArgList &args)
+{
+    if (args.size() < 1)
+        return JSC::throwError(exec, JSC::GeneralError, "qsTrId() requires at least one argument");
+    if (!args.at(0).isString())
+        return JSC::throwError(exec, JSC::TypeError, "qsTrId(): first argument (id) must be a string");
+    if ((args.size() > 1) && !args.at(1).isNumber())
+        return JSC::throwError(exec, JSC::TypeError, "qsTrId(): second argument (n) must be a number");
+    JSC::UString id = args.at(0).toString(exec);
+    int n = -1;
+    if (args.size() > 1)
+        n = args.at(1).toInt32(exec);
+    return JSC::jsString(exec, qtTrId(QScript::convertToLatin1(id).constData(), n));
+}
+JSC::JSValue JSC_HOST_CALL functionQsTrIdNoOp(JSC::ExecState *, JSC::JSObject*, JSC::JSValue, const JSC::ArgList &args)
+{
     if (args.size() < 1)
 …
+    }
     JSC::initializeThreading();
+    JSC::IdentifierTable *oldTable = JSC::currentIdentifierTable();
     globalData = JSC::JSGlobalData::create().releaseRef();
     globalData->clientData = new QScript::GlobalClientData(this);
 …
     scriptObjectStructure = QScriptObject::createStructure(globalObject->objectPrototype());
+    staticScopeObjectStructure = QScriptStaticScopeObject::createStructure(JSC::jsNull());
     qobjectPrototype = new (exec) QScript::QObjectPrototype(exec, QScript::QObjectPrototype::createStructure(globalObject->objectPrototype()), globalObject->prototypeFunctionStructure());
 …
     agentLineNumber = -1;
     processEventsInterval = -1;
+    cachedTranslationUrl = JSC::UString();
+    cachedTranslationContext = JSC::UString();
+    JSC::setCurrentIdentifierTable(oldTable);
+}
 QScriptEnginePrivate::~QScriptEnginePrivate()
+{
+    QScript::APIShim shim(this);
     //disconnect all loadedScripts and generate all jsc::debugger::scriptUnload events
     QHash<intptr_t,QScript::UStringSourceProviderWithFeedback*>::const_iterator it;
 …
         delete ownedAgents.takeFirst();
+    detachAllRegisteredScriptPrograms();
     detachAllRegisteredScriptValues();
     detachAllRegisteredScriptStrings();
     qDeleteAll(m_qobjectData);
     qDeleteAll(m_typeInfos);
-    JSC::JSLock lock(false);
     globalData->heap.destroy();
     globalData->deref();
 …
+}
+QScriptValue QScriptEnginePrivate::scriptValueFromVariant(const QVariant &v)
+{
+    Q_Q(QScriptEngine);
+    QScriptValue result = q->create(v.userType(), v.data());
+    Q_ASSERT(result.isValid());
+    return result;
+}
+QVariant QScriptEnginePrivate::scriptValueToVariant(const QScriptValue &value, int targetType)
+QVariant QScriptEnginePrivate::jscValueToVariant(JSC::ExecState *exec, JSC::JSValue value, int targetType)
+{
     QVariant v(targetType, (void *)0);
     if (QScriptEnginePrivate::convert(value, targetType, v.data(), this))
+    if (convertValue(exec, value, targetType, v.data()))
         return v;
     if (uint(targetType) == QVariant::LastType)
         return value.toVariant();
     if (value.isVariant()) {
         v = value.toVariant();
+        return toVariant(exec, value);
+    if (isVariant(value)) {
+        v = variantValue(value);
         if (v.canConvert(QVariant::Type(targetType))) {
             v.convert(QVariant::Type(targetType));
 …
+        }
+    }
     return QVariant();
+}
+JSC::JSValue QScriptEnginePrivate::jscValueFromVariant(const QVariant &v)
+{
+    // ### it's inefficient to convert to QScriptValue and then to JSValue
+    QScriptValue vv = scriptValueFromVariant(v);
+    QScriptValuePrivate *p = QScriptValuePrivate::get(vv);
+    switch (p->type) {
+    case QScriptValuePrivate::JavaScriptCore:
+        return p->jscValue;
+    case QScriptValuePrivate::Number:
+        return JSC::jsNumber(currentFrame, p->numberValue);
+    case QScriptValuePrivate::String: {
+        JSC::UString str = p->stringValue;
+        return JSC::jsString(currentFrame, str);
+      }
+    }
+    return JSC::JSValue();
+}
+QVariant QScriptEnginePrivate::jscValueToVariant(JSC::JSValue value, int targetType)
+{
+    // ### it's inefficient to convert to QScriptValue and then to QVariant
+    return scriptValueToVariant(scriptValueFromJSCValue(value), targetType);
+}
+QScriptValue QScriptEnginePrivate::arrayFromStringList(const QStringList &lst)
+{
+    Q_Q(QScriptEngine);
+    QScriptValue arr = q->newArray(lst.size());
+JSC::JSValue QScriptEnginePrivate::arrayFromStringList(JSC::ExecState *exec, const QStringList &lst)
+{
+    JSC::JSValue arr =  newArray(exec, lst.size());
     for (int i = 0; i < lst.size(); ++i)
         arr.setProperty(i, QScriptValue(q, lst.at(i)));
+        setProperty(exec, arr, i, JSC::jsString(exec, lst.at(i)));
     return arr;
+}
 QStringList QScriptEnginePrivate::stringListFromArray(const QScriptValue &arr)
+QStringList QScriptEnginePrivate::stringListFromArray(JSC::ExecState *exec, JSC::JSValue arr)
+{
     QStringList lst;
     uint len = arr.property(QLatin1String("length")).toUInt32();
+    uint len = toUInt32(exec, property(exec, arr, exec->propertyNames().length));
     for (uint i = 0; i < len; ++i)
         lst.append(arr.property(i).toString());
+        lst.append(toString(exec, property(exec, arr, i)));
     return lst;
+}
+QScriptValue QScriptEnginePrivate::arrayFromVariantList(const QVariantList &lst)
+{
+    Q_Q(QScriptEngine);
+    QScriptValue arr = q->newArray(lst.size());
+JSC::JSValue QScriptEnginePrivate::arrayFromVariantList(JSC::ExecState *exec, const QVariantList &lst)
+{
+    JSC::JSValue arr = newArray(exec, lst.size());
     for (int i = 0; i < lst.size(); ++i)
         arr.setProperty(i, scriptValueFromVariant(lst.at(i)));
+        setProperty(exec, arr, i, jscValueFromVariant(exec, lst.at(i)));
     return arr;
+}
+QVariantList QScriptEnginePrivate::variantListFromArray(const QScriptValue &arr)
+{
+QVariantList QScriptEnginePrivate::variantListFromArray(JSC::ExecState *exec, JSC::JSArray *arr)
+{
+    QScriptEnginePrivate *eng = QScript::scriptEngineFromExec(exec);
+    if (eng->visitedConversionObjects.contains(arr))
+        return QVariantList(); // Avoid recursion.
+    eng->visitedConversionObjects.insert(arr);
     QVariantList lst;
     uint len = arr.property(QLatin1String("length")).toUInt32();
+    uint len = toUInt32(exec, property(exec, arr, exec->propertyNames().length));
     for (uint i = 0; i < len; ++i)
+        lst.append(arr.property(i).toVariant());
+        lst.append(toVariant(exec, property(exec, arr, i)));
+    eng->visitedConversionObjects.remove(arr);
     return lst;
+}
+QScriptValue QScriptEnginePrivate::objectFromVariantMap(const QVariantMap &vmap)
+{
+    Q_Q(QScriptEngine);
+    QScriptValue obj = q->newObject();
+JSC::JSValue QScriptEnginePrivate::objectFromVariantMap(JSC::ExecState *exec, const QVariantMap &vmap)
+{
+    JSC::JSValue obj = JSC::constructEmptyObject(exec);
     QVariantMap::const_iterator it;
     for (it = vmap.constBegin(); it != vmap.constEnd(); ++it)
         obj.setProperty(it.key(), scriptValueFromVariant(it.value()));
+        setProperty(exec, obj, it.key(), jscValueFromVariant(exec, it.value()));
     return obj;
+}
+QVariantMap QScriptEnginePrivate::variantMapFromObject(const QScriptValue &obj)
+{
+QVariantMap QScriptEnginePrivate::variantMapFromObject(JSC::ExecState *exec, JSC::JSObject *obj)
+{
+    QScriptEnginePrivate *eng = QScript::scriptEngineFromExec(exec);
+    if (eng->visitedConversionObjects.contains(obj))
+        return QVariantMap(); // Avoid recursion.
+    eng->visitedConversionObjects.insert(obj);
+    JSC::PropertyNameArray propertyNames(exec);
+    obj->getOwnPropertyNames(exec, propertyNames, JSC::IncludeDontEnumProperties);
     QVariantMap vmap;
+    QScriptValueIterator it(obj);
+    while (it.hasNext()) {
+        it.next();
+        vmap.insert(it.name(), it.value().toVariant());
+    }
+    JSC::PropertyNameArray::const_iterator it = propertyNames.begin();
+    for( ; it != propertyNames.end(); ++it)
+        vmap.insert(it->ustring(), toVariant(exec, property(exec, obj, *it)));
+    eng->visitedConversionObjects.remove(obj);
     return vmap;
+}
 …
 void QScriptEnginePrivate::collectGarbage()
+{
+    JSC::JSLock lock(false);
+    globalData->heap.collect();
+    QScript::APIShim shim(this);
+    globalData->heap.collectAllGarbage();
+}
+void QScriptEnginePrivate::reportAdditionalMemoryCost(int size)
+{
+    if (size > 0)
+        globalData->heap.reportExtraMemoryCost(size);
+}
 …
+{
     Q_Q(QScriptEngine);
-    JSC::JSLock lock(false); // ### hmmm
     QBoolBlocker inEvalBlocker(inEval, true);
     q->currentContext()->activationObject(); //force the creation of a context for native function;
 …
     q->clearExceptions();
     JSC::DynamicGlobalObjectScope dynamicGlobalObjectScope(exec, exec->scopeChain()->globalObject());
+    JSC::DynamicGlobalObjectScope dynamicGlobalObjectScope(exec, exec->scopeChain()->globalObject);
     if (compile) {
 …
+}
 bool QScriptEnginePrivate::convertToNativeQObject(const QScriptValue &value,
+bool QScriptEnginePrivate::convertToNativeQObject(JSC::ExecState *exec, JSC::JSValue value,
                                                   const QByteArray &targetType,
                                                   void **result)
 …
     if (!targetType.endsWith('*'))
         return false;
     if (QObject *qobject = value.toQObject()) {
+    if (QObject *qobject = toQObject(exec, value)) {
         int start = targetType.startsWith("const ") ? 6 : 0;
         QByteArray className = targetType.mid(start, targetType.size()-start-1);
 …
 #endif
+void QScriptEnginePrivate::detachAllRegisteredScriptPrograms()
+{
+    QSet<QScriptProgramPrivate*>::const_iterator it;
+    for (it = registeredScriptPrograms.constBegin(); it != registeredScriptPrograms.constEnd(); ++it)
+        (*it)->detachFromEngine();
+    registeredScriptPrograms.clear();
+}
 void QScriptEnginePrivate::detachAllRegisteredScriptValues()
+{
 …
+}
-#ifdef QT_NO_QOBJECT
-QScriptEngine::QScriptEngine()
-    : d_ptr(new QScriptEnginePrivate)
+{
-    d_ptr->q_ptr = this;
+}
-/*! \internal
-*/
-QScriptEngine::QScriptEngine(QScriptEnginePrivate &dd)
-    : d_ptr(&dd)
+{
-    d_ptr->q_ptr = this;
+}
-#else
-/*!
-    Constructs a QScriptEngine object.
-    The globalObject() is initialized to have properties as described in
-    \l{ECMA-262}, Section 15.1.
-*/
-QScriptEngine::QScriptEngine()
-    : QObject(*new QScriptEnginePrivate, 0)
+{
+}
-/*!
-    Constructs a QScriptEngine object with the given \a parent.
-    The globalObject() is initialized to have properties as described in
-    \l{ECMA-262}, Section 15.1.
-*/
-QScriptEngine::QScriptEngine(QObject *parent)
-    : QObject(*new QScriptEnginePrivate, parent)
+{
+}
-/*! \internal
-*/
-QScriptEngine::QScriptEngine(QScriptEnginePrivate &dd, QObject *parent)
-    : QObject(dd, parent)
+{
+}
-#endif
-/*!
-  Destroys this QScriptEngine.
-*/
-QScriptEngine::~QScriptEngine()
+{
-#ifdef QT_NO_QOBJECT
-    delete d_ptr;
-    d_ptr = 0;
-#endif
+}
-/*!
-  Returns this engine's Global Object.
-  By default, the Global Object contains the built-in objects that are
-  part of \l{ECMA-262}, such as Math, Date and String. Additionally,
-  you can set properties of the Global Object to make your own
-  extensions available to all script code. Non-local variables in
-  script code will be created as properties of the Global Object, as
-  well as local variables in global code.
-*/
-QScriptValue QScriptEngine::globalObject() const
+{
-    Q_D(const QScriptEngine);
-    JSC::JSObject *result = d->globalObject();
-    return const_cast<QScriptEnginePrivate*>(d)->scriptValueFromJSCValue(result);
+}
-/*!
-  \since 4.5
-  Sets this engine's Global Object to be the given \a object.
-  If \a object is not a valid script object, this function does
-  nothing.
-  When setting a custom global object, you may want to use
-  QScriptValueIterator to copy the properties of the standard Global
-  Object; alternatively, you can set the internal prototype of your
-  custom object to be the original Global Object.
-*/
-void QScriptEngine::setGlobalObject(const QScriptValue &object)
+{
-    Q_D(QScriptEngine);
-    if (!object.isObject())
-        return;
-    JSC::JSObject *jscObject = JSC::asObject(d->scriptValueToJSCValue(object));
-    d->setGlobalObject(jscObject);
+}
-/*!
-  Returns a QScriptValue of the primitive type Null.
-  \sa undefinedValue()
-*/
-QScriptValue QScriptEngine::nullValue()
+{
-    Q_D(QScriptEngine);
-    return d->scriptValueFromJSCValue(JSC::jsNull());
+}
-/*!
-  Returns a QScriptValue of the primitive type Undefined.
-  \sa nullValue()
-*/
-QScriptValue QScriptEngine::undefinedValue()
+{
-    Q_D(QScriptEngine);
-    return d->scriptValueFromJSCValue(JSC::jsUndefined());
+}
-/*!
-  Creates a constructor function from \a fun, with the given \a length.
-  The \c{prototype} property of the resulting function is set to be the
-  given \a prototype. The \c{constructor} property of \a prototype is
-  set to be the resulting function.
-  When a function is called as a constructor (e.g. \c{new Foo()}), the
-  `this' object associated with the function call is the new object
-  that the function is expected to initialize; the prototype of this
-  default constructed object will be the function's public
-  \c{prototype} property. If you always want the function to behave as
-  a constructor (e.g. \c{Foo()} should also create a new object), or
-  if you need to create your own object rather than using the default
-  `this' object, you should make sure that the prototype of your
-  object is set correctly; either by setting it manually, or, when
-  wrapping a custom type, by having registered the defaultPrototype()
-  of that type. Example:
-  \snippet doc/src/snippets/code/src_script_qscriptengine.cpp 9
-  To wrap a custom type and provide a constructor for it, you'd typically
-  do something like this:
-  \snippet doc/src/snippets/code/src_script_qscriptengine.cpp 10
-*/
-QScriptValue QScriptEngine::newFunction(QScriptEngine::FunctionSignature fun,
-                                        const QScriptValue &prototype,
-                                        int length)
+{
-    Q_D(QScriptEngine);
-    JSC::ExecState* exec = d->currentFrame;
-    JSC::JSValue function = new (exec)QScript::FunctionWrapper(exec, length, JSC::Identifier(exec, ""), fun);
-    QScriptValue result = d->scriptValueFromJSCValue(function);
-    result.setProperty(QLatin1String("prototype"), prototype, QScriptValue::Undeletable);
-    const_cast<QScriptValue&>(prototype)
-        .setProperty(QLatin1String("constructor"), result,
-                     QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
-    return result;
+}
 #ifndef QT_NO_REGEXP
+Q_DECL_IMPORT extern QString qt_regexp_toCanonical(const QString &, QRegExp::PatternSyntax);
+/*!
+  Creates a QtScript object of class RegExp with the given
+  \a regexp.
+  \sa QScriptValue::toRegExp()
+*/
+QScriptValue QScriptEngine::newRegExp(const QRegExp &regexp)
+{
+    Q_D(QScriptEngine);
+    JSC::ExecState* exec = d->currentFrame;
+Q_CORE_EXPORT QString qt_regexp_toCanonical(const QString &, QRegExp::PatternSyntax);
+JSC::JSValue QScriptEnginePrivate::newRegExp(JSC::ExecState *exec, const QRegExp &regexp)
+{
     JSC::JSValue buf[2];
     JSC::ArgList args(buf, sizeof(buf));
 …
             case ']':
                 inBracket = false;
                 break;
+               break;
             default:
                 break;
 …
     buf[0] = JSC::jsString(exec, jscPattern);
     buf[1] = JSC::jsString(exec, jscFlags);
+    JSC::JSObject* result = JSC::constructRegExp(exec, args);
+    return d->scriptValueFromJSCValue(result);
+}
+#endif // QT_NO_REGEXP
+/*!
+  Creates a QtScript object holding the given variant \a value.
+  If a default prototype has been registered with the meta type id of
+  \a value, then the prototype of the created object will be that
+  prototype; otherwise, the prototype will be the Object prototype
+  object.
+  \sa setDefaultPrototype(), QScriptValue::toVariant()
+*/
+QScriptValue QScriptEngine::newVariant(const QVariant &value)
+{
+    Q_D(QScriptEngine);
+    JSC::ExecState* exec = d->currentFrame;
+    QScriptObject *obj = new (exec) QScriptObject(d->variantWrapperObjectStructure);
+    obj->setDelegate(new QScript::QVariantDelegate(value));
+    QScriptValue result = d->scriptValueFromJSCValue(obj);
+    QScriptValue proto = defaultPrototype(value.userType());
+    if (proto.isValid())
+        result.setPrototype(proto);
+    return result;
+}
+/*!
+  \since 4.4
+  \overload
+  Initializes the given Qt Script \a object to hold the given variant
+  \a value, and returns the \a object.
+  This function enables you to "promote" a plain Qt Script object
+  (created by the newObject() function) to a variant, or to replace
+  the variant contained inside an object previously created by the
+  newVariant() function.
+  The prototype() of the \a object will remain unchanged.
+  If \a object is not an object, this function behaves like the normal
+  newVariant(), i.e. it creates a new script object and returns it.
+  This function is useful when you want to provide a script
+  constructor for a C++ type. If your constructor is invoked in a
+  \c{new} expression (QScriptContext::isCalledAsConstructor() returns
+  true), you can pass QScriptContext::thisObject() (the default
+  constructed script object) to this function to initialize the new
+  object.
+*/
+QScriptValue QScriptEngine::newVariant(const QScriptValue &object,
+                                       const QVariant &value)
+{
+    if (!object.isObject())
+        return newVariant(value);
+    JSC::JSObject *jscObject = JSC::asObject(QScriptValuePrivate::get(object)->jscValue);
+    if (!jscObject->inherits(&QScriptObject::info)) {
+        qWarning("QScriptEngine::newVariant(): changing class of non-QScriptObject not supported");
+        return QScriptValue();
+    }
+    QScriptObject *jscScriptObject = static_cast<QScriptObject*>(jscObject);
+    if (!object.isVariant()) {
+        jscScriptObject->setDelegate(new QScript::QVariantDelegate(value));
+    } else {
+        QScriptValuePrivate::get(object)->setVariantValue(value);
+    }
+    return object;
+}
+#ifndef QT_NO_QOBJECT
+/*!
+  Creates a QtScript object that wraps the given QObject \a
+  object, using the given \a ownership. The given \a options control
+  various aspects of the interaction with the resulting script object.
+  Signals and slots, properties and children of \a object are
+  available as properties of the created QScriptValue. For more
+  information, see the \l{QtScript} documentation.
+  If \a object is a null pointer, this function returns nullValue().
+  If a default prototype has been registered for the \a object's class
+  (or its superclass, recursively), the prototype of the new script
+  object will be set to be that default prototype.
+  If the given \a object is deleted outside of QtScript's control, any
+  attempt to access the deleted QObject's members through the QtScript
+  wrapper object (either by script code or C++) will result in a
+  script exception.
+  \sa QScriptValue::toQObject()
+*/
+QScriptValue QScriptEngine::newQObject(QObject *object, ValueOwnership ownership,
+                                       const QObjectWrapOptions &options)
+{
+    Q_D(QScriptEngine);
+    JSC::JSValue jscQObject = d->newQObject(object, ownership, options);
+    return d->scriptValueFromJSCValue(jscQObject);
+}
+/*!
+  \since 4.4
+  \overload
+  Initializes the given \a scriptObject to hold the given \a qtObject,
+  and returns the \a scriptObject.
+  This function enables you to "promote" a plain Qt Script object
+  (created by the newObject() function) to a QObject proxy, or to
+  replace the QObject contained inside an object previously created by
+  the newQObject() function.
+  The prototype() of the \a scriptObject will remain unchanged.
+  If \a scriptObject is not an object, this function behaves like the
+  normal newQObject(), i.e. it creates a new script object and returns
+  it.
+  This function is useful when you want to provide a script
+  constructor for a QObject-based class. If your constructor is
+  invoked in a \c{new} expression
+  (QScriptContext::isCalledAsConstructor() returns true), you can pass
+  QScriptContext::thisObject() (the default constructed script object)
+  to this function to initialize the new object.
+*/
+QScriptValue QScriptEngine::newQObject(const QScriptValue &scriptObject,
+                                       QObject *qtObject,
+                                       ValueOwnership ownership,
+                                       const QObjectWrapOptions &options)
+{
+    if (!scriptObject.isObject())
+        return newQObject(qtObject, ownership, options);
+    JSC::JSObject *jscObject = JSC::asObject(QScriptValuePrivate::get(scriptObject)->jscValue);
+    if (!jscObject->inherits(&QScriptObject::info)) {
+        qWarning("QScriptEngine::newQObject(): changing class of non-QScriptObject not supported");
+        return QScriptValue();
+    }
+    QScriptObject *jscScriptObject = static_cast<QScriptObject*>(jscObject);
+    if (!scriptObject.isQObject()) {
+        jscScriptObject->setDelegate(new QScript::QObjectDelegate(qtObject, ownership, options));
+    } else {
+        QScript::QObjectDelegate *delegate = static_cast<QScript::QObjectDelegate*>(jscScriptObject->delegate());
+        delegate->setValue(qtObject);
+        delegate->setOwnership(ownership);
+        delegate->setOptions(options);
+    }
+    return scriptObject;
+}
+#endif // QT_NO_QOBJECT
+/*!
+  Creates a QtScript object of class Object.
+  The prototype of the created object will be the Object
+  prototype object.
+  \sa newArray(), QScriptValue::setProperty()
+*/
+QScriptValue QScriptEngine::newObject()
+{
+    Q_D(QScriptEngine);
+    JSC::ExecState* exec = d->currentFrame;
+    JSC::JSObject *result = new (exec)QScriptObject(d->scriptObjectStructure);
+    return d->scriptValueFromJSCValue(result);
+}
+/*!
+  \since 4.4
+  \overload
+  Creates a QtScript Object of the given class, \a scriptClass.
+  The prototype of the created object will be the Object
+  prototype object.
+  \a data, if specified, is set as the internal data of the
+  new object (using QScriptValue::setData()).
+  \sa QScriptValue::scriptClass()
+*/
+QScriptValue QScriptEngine::newObject(QScriptClass *scriptClass,
+                                      const QScriptValue &data)
+{
+    Q_D(QScriptEngine);
+    JSC::ExecState* exec = d->currentFrame;
+    QScriptObject *result = new (exec) QScriptObject(d->scriptObjectStructure);
+    result->setDelegate(new QScript::ClassObjectDelegate(scriptClass));
+    QScriptValue scriptObject = d->scriptValueFromJSCValue(result);
+    scriptObject.setData(data);
+    QScriptValue proto = scriptClass->prototype();
+    if (proto.isValid())
+        scriptObject.setPrototype(proto);
+    return scriptObject;
+}
+/*!
+  \internal
+*/
+QScriptValue QScriptEngine::newActivationObject()
+{
+    qWarning("QScriptEngine::newActivationObject() not implemented");
+    // ### JSActivation or JSVariableObject?
+    return QScriptValue();
+}
+/*!
+  Creates a QScriptValue that wraps a native (C++) function. \a fun
+  must be a C++ function with signature QScriptEngine::FunctionSignature.  \a
+  length is the number of arguments that \a fun expects; this becomes
+  the \c{length} property of the created QScriptValue.
+  Note that \a length only gives an indication of the number of
+  arguments that the function expects; an actual invocation of a
+  function can include any number of arguments. You can check the
+  \l{QScriptContext::argumentCount()}{argumentCount()} of the
+  QScriptContext associated with the invocation to determine the
+  actual number of arguments passed.
+  A \c{prototype} property is automatically created for the resulting
+  function object, to provide for the possibility that the function
+  will be used as a constructor.
+  By combining newFunction() and the property flags
+  QScriptValue::PropertyGetter and QScriptValue::PropertySetter, you
+  can create script object properties that behave like normal
+  properties in script code, but are in fact accessed through
+  functions (analogous to how properties work in \l{Qt's Property
+  System}). Example:
+  \snippet doc/src/snippets/code/src_script_qscriptengine.cpp 11
+  When the property \c{foo} of the script object is subsequently
+  accessed in script code, \c{getSetFoo()} will be invoked to handle
+  the access.  In this particular case, we chose to store the "real"
+  value of \c{foo} as a property of the accessor function itself; you
+  are of course free to do whatever you like in this function.
+  In the above example, a single native function was used to handle
+  both reads and writes to the property; the argument count is used to
+  determine if we are handling a read or write. You can also use two
+  separate functions; just specify the relevant flag
+  (QScriptValue::PropertyGetter or QScriptValue::PropertySetter) when
+  setting the property, e.g.:
+  \snippet doc/src/snippets/code/src_script_qscriptengine.cpp 12
+  \sa QScriptValue::call()
+*/
+QScriptValue QScriptEngine::newFunction(QScriptEngine::FunctionSignature fun, int length)
+{
+    Q_D(QScriptEngine);
+    JSC::ExecState* exec = d->currentFrame;
+    JSC::JSValue function = new (exec)QScript::FunctionWrapper(exec, length, JSC::Identifier(exec, ""), fun);
+    QScriptValue result = d->scriptValueFromJSCValue(function);
+    QScriptValue proto = newObject();
+    result.setProperty(QLatin1String("prototype"), proto, QScriptValue::Undeletable);
+    proto.setProperty(QLatin1String("constructor"), result,
+                      QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+    return result;
+}
+/*!
+  \internal
+  \since 4.4
+*/
+QScriptValue QScriptEngine::newFunction(QScriptEngine::FunctionWithArgSignature fun, void *arg)
+{
+    Q_D(QScriptEngine);
+    JSC::ExecState* exec = d->currentFrame;
+    JSC::JSValue function = new (exec)QScript::FunctionWithArgWrapper(exec, /*length=*/0, JSC::Identifier(exec, ""), fun, arg);
+    QScriptValue result = d->scriptValueFromJSCValue(function);
+    QScriptValue proto = newObject();
+    result.setProperty(QLatin1String("prototype"), proto, QScriptValue::Undeletable);
+    proto.setProperty(QLatin1String("constructor"), result,
+                      QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+    return result;
+}
+/*!
+  Creates a QtScript object of class Array with the given \a length.
+  \sa newObject()
+*/
+QScriptValue QScriptEngine::newArray(uint length)
+{
+    Q_D(QScriptEngine);
+    JSC::ExecState* exec = d->currentFrame;
+    JSC::JSArray* result = JSC::constructEmptyArray(exec, length);
+    return d->scriptValueFromJSCValue(result);
+}
+/*!
+  Creates a QtScript object of class RegExp with the given
+  \a pattern and \a flags.
+  The legal flags are 'g' (global), 'i' (ignore case), and 'm'
+  (multiline).
+*/
+QScriptValue QScriptEngine::newRegExp(const QString &pattern, const QString &flags)
+{
+    Q_D(QScriptEngine);
+    JSC::ExecState* exec = d->currentFrame;
+    return JSC::constructRegExp(exec, args);
+}
+#endif
+JSC::JSValue QScriptEnginePrivate::newRegExp(JSC::ExecState *exec, const QString &pattern, const QString &flags)
+{
     JSC::JSValue buf[2];
     JSC::ArgList args(buf, sizeof(buf));
 …
     buf[0] = JSC::jsString(exec, jscPattern);
     buf[1] = JSC::jsString(exec, jscFlags);
+    JSC::JSObject* result = JSC::constructRegExp(exec, args);
+    return d->scriptValueFromJSCValue(result);
+    return JSC::constructRegExp(exec, args);
+}
+JSC::JSValue QScriptEnginePrivate::newVariant(const QVariant &value)
+{
+    QScriptObject *obj = new (currentFrame) QScriptObject(variantWrapperObjectStructure);
+    obj->setDelegate(new QScript::QVariantDelegate(value));
+    JSC::JSValue proto = defaultPrototype(value.userType());
+    if (proto)
+        obj->setPrototype(proto);
+    return obj;
+}
+JSC::JSValue QScriptEnginePrivate::newVariant(JSC::JSValue objectValue,
+                                              const QVariant &value)
+{
+    if (!isObject(objectValue))
+        return newVariant(value);
+    JSC::JSObject *jscObject = JSC::asObject(objectValue);
+    if (!jscObject->inherits(&QScriptObject::info)) {
+        qWarning("QScriptEngine::newVariant(): changing class of non-QScriptObject not supported");
+        return JSC::JSValue();
+    }
+    QScriptObject *jscScriptObject = static_cast<QScriptObject*>(jscObject);
+    if (!isVariant(objectValue)) {
+        jscScriptObject->setDelegate(new QScript::QVariantDelegate(value));
+    } else {
+        setVariantValue(objectValue, value);
+    }
+    return objectValue;
+}
+#ifndef QT_NO_REGEXP
+QRegExp QScriptEnginePrivate::toRegExp(JSC::ExecState *exec, JSC::JSValue value)
+{
+    if (!isRegExp(value))
+        return QRegExp();
+    QString pattern = toString(exec, property(exec, value, "source", QScriptValue::ResolvePrototype));
+    Qt::CaseSensitivity kase = Qt::CaseSensitive;
+    if (toBool(exec, property(exec, value, "ignoreCase", QScriptValue::ResolvePrototype)))
+        kase = Qt::CaseInsensitive;
+    return QRegExp(pattern, kase, QRegExp::RegExp2);
+}
+#endif
+QVariant QScriptEnginePrivate::toVariant(JSC::ExecState *exec, JSC::JSValue value)
+{
+    if (!value) {
+        return QVariant();
+    } else if (isObject(value)) {
+        if (isVariant(value))
+            return variantValue(value);
+#ifndef QT_NO_QOBJECT
+        else if (isQObject(value))
+            return qVariantFromValue(toQObject(exec, value));
+#endif
+        else if (isDate(value))
+            return QVariant(toDateTime(exec, value));
+#ifndef QT_NO_REGEXP
+        else if (isRegExp(value))
+            return QVariant(toRegExp(exec, value));
+#endif
+        else if (isArray(value))
+            return variantListFromArray(exec, JSC::asArray(value));
+        else if (QScriptDeclarativeClass *dc = declarativeClass(value))
+            return dc->toVariant(declarativeObject(value));
+        return variantMapFromObject(exec, JSC::asObject(value));
+    } else if (value.isNumber()) {
+        return QVariant(toNumber(exec, value));
+    } else if (value.isString()) {
+        return QVariant(toString(exec, value));
+    } else if (value.isBoolean()) {
+        return QVariant(toBool(exec, value));
+    }
+    return QVariant();
+}
+JSC::JSValue QScriptEnginePrivate::propertyHelper(JSC::ExecState *exec, JSC::JSValue value, const JSC::Identifier &id, int resolveMode)
+{
+    JSC::JSValue result;
+    if (!(resolveMode & QScriptValue::ResolvePrototype)) {
+        // Look in the object's own properties
+        JSC::JSObject *object = JSC::asObject(value);
+        JSC::PropertySlot slot(object);
+        if (object->getOwnPropertySlot(exec, id, slot))
+            result = slot.getValue(exec, id);
+    }
+    if (!result && (resolveMode & QScriptValue::ResolveScope)) {
+        // ### check if it's a function object and look in the scope chain
+        JSC::JSValue scope = property(exec, value, "__qt_scope__", QScriptValue::ResolveLocal);
+        if (isObject(scope))
+            result = property(exec, scope, id, resolveMode);
+    }
+    return result;
+}
+JSC::JSValue QScriptEnginePrivate::propertyHelper(JSC::ExecState *exec, JSC::JSValue value, quint32 index, int resolveMode)
+{
+    JSC::JSValue result;
+    if (!(resolveMode & QScriptValue::ResolvePrototype)) {
+        // Look in the object's own properties
+        JSC::JSObject *object = JSC::asObject(value);
+        JSC::PropertySlot slot(object);
+        if (object->getOwnPropertySlot(exec, index, slot))
+            result = slot.getValue(exec, index);
+    }
+    return result;
+}
+void QScriptEnginePrivate::setProperty(JSC::ExecState *exec, JSC::JSValue objectValue, const JSC::Identifier &id,
+                                       JSC::JSValue value, const QScriptValue::PropertyFlags &flags)
+{
+    JSC::JSObject *thisObject = JSC::asObject(objectValue);
+    JSC::JSValue setter = thisObject->lookupSetter(exec, id);
+    JSC::JSValue getter = thisObject->lookupGetter(exec, id);
+    if ((flags & QScriptValue::PropertyGetter) || (flags & QScriptValue::PropertySetter)) {
+        if (!value) {
+            // deleting getter/setter
+            if ((flags & QScriptValue::PropertyGetter) && (flags & QScriptValue::PropertySetter)) {
+                // deleting both: just delete the property
+                thisObject->deleteProperty(exec, id);
+            } else if (flags & QScriptValue::PropertyGetter) {
+                // preserve setter, if there is one
+                thisObject->deleteProperty(exec, id);
+                if (setter && setter.isObject())
+                    thisObject->defineSetter(exec, id, JSC::asObject(setter));
+            } else { // flags & QScriptValue::PropertySetter
+                // preserve getter, if there is one
+                thisObject->deleteProperty(exec, id);
+                if (getter && getter.isObject())
+                    thisObject->defineGetter(exec, id, JSC::asObject(getter));
+            }
+        } else {
+            if (value.isObject()) { // ### should check if it has callData()
+                // defining getter/setter
+                if (id == exec->propertyNames().underscoreProto) {
+                    qWarning("QScriptValue::setProperty() failed: "
+                             "cannot set getter or setter of native property `__proto__'");
+                } else {
+                    if (flags & QScriptValue::PropertyGetter)
+                        thisObject->defineGetter(exec, id, JSC::asObject(value));
+                    if (flags & QScriptValue::PropertySetter)
+                        thisObject->defineSetter(exec, id, JSC::asObject(value));
+                }
+            } else {
+                qWarning("QScriptValue::setProperty(): getter/setter must be a function");
+            }
+        }
+    } else {
+        // setting the value
+        if (getter && getter.isObject() && !(setter && setter.isObject())) {
+            qWarning("QScriptValue::setProperty() failed: "
+                     "property '%s' has a getter but no setter",
+                     qPrintable(QString(id.ustring())));
+            return;
+        }
+        if (!value) {
+            // ### check if it's a getter/setter property
+            thisObject->deleteProperty(exec, id);
+        } else if (flags != QScriptValue::KeepExistingFlags) {
+            if (thisObject->hasOwnProperty(exec, id))
+                thisObject->deleteProperty(exec, id); // ### hmmm - can't we just update the attributes?
+            thisObject->putWithAttributes(exec, id, value, propertyFlagsToJSCAttributes(flags));
+        } else {
+            JSC::PutPropertySlot slot;
+            thisObject->put(exec, id, value, slot);
+        }
+    }
+}
+void QScriptEnginePrivate::setProperty(JSC::ExecState *exec, JSC::JSValue objectValue, quint32 index,
+                                       JSC::JSValue value, const QScriptValue::PropertyFlags &flags)
+{
+    if (!value) {
+        JSC::asObject(objectValue)->deleteProperty(exec, index);
+    } else {
+        if ((flags & QScriptValue::PropertyGetter) || (flags & QScriptValue::PropertySetter)) {
+            // fall back to string-based setProperty(), since there is no
+            // JSC::JSObject::defineGetter(unsigned)
+            setProperty(exec, objectValue, JSC::Identifier::from(exec, index), value, flags);
+        } else {
+            if (flags != QScriptValue::KeepExistingFlags) {
+                //                if (JSC::asObject(d->jscValue)->hasOwnProperty(exec, arrayIndex))
+                //                    JSC::asObject(d->jscValue)->deleteProperty(exec, arrayIndex);
+                unsigned attribs = 0;
+                if (flags & QScriptValue::ReadOnly)
+                    attribs |= JSC::ReadOnly;
+                if (flags & QScriptValue::SkipInEnumeration)
+                    attribs |= JSC::DontEnum;
+                if (flags & QScriptValue::Undeletable)
+                    attribs |= JSC::DontDelete;
+                attribs |= flags & QScriptValue::UserRange;
+                JSC::asObject(objectValue)->putWithAttributes(exec, index, value, attribs);
+            } else {
+                JSC::asObject(objectValue)->put(exec, index, value);
+            }
+        }
+    }
+}
+QScriptValue::PropertyFlags QScriptEnginePrivate::propertyFlags(JSC::ExecState *exec, JSC::JSValue value, const JSC::Identifier &id,
+                                                                const QScriptValue::ResolveFlags &mode)
+{
+    JSC::JSObject *object = JSC::asObject(value);
+    unsigned attribs = 0;
+    JSC::PropertyDescriptor descriptor;
+    if (object->getOwnPropertyDescriptor(exec, id, descriptor))
+        attribs = descriptor.attributes();
+    else {
+        if ((mode & QScriptValue::ResolvePrototype) && object->prototype() && object->prototype().isObject()) {
+            JSC::JSValue proto = object->prototype();
+            return propertyFlags(exec, proto, id, mode);
+        }
+        return 0;
+    }
+    QScriptValue::PropertyFlags result = 0;
+    if (attribs & JSC::ReadOnly)
+        result |= QScriptValue::ReadOnly;
+    if (attribs & JSC::DontEnum)
+        result |= QScriptValue::SkipInEnumeration;
+    if (attribs & JSC::DontDelete)
+        result |= QScriptValue::Undeletable;
+    //We cannot rely on attribs JSC::Setter/Getter because they are not necesserly set by JSC (bug?)
+    if (attribs & JSC::Getter || !object->lookupGetter(exec, id).isUndefinedOrNull())
+        result |= QScriptValue::PropertyGetter;
+    if (attribs & JSC::Setter || !object->lookupSetter(exec, id).isUndefinedOrNull())
+        result |= QScriptValue::PropertySetter;
+#ifndef QT_NO_QOBJECT
+    if (attribs & QScript::QObjectMemberAttribute)
+        result |= QScriptValue::QObjectMember;
+#endif
+    result |= QScriptValue::PropertyFlag(attribs & QScriptValue::UserRange);
+    return result;
+}
+QScriptString QScriptEnginePrivate::toStringHandle(const JSC::Identifier &name)
+{
+    QScriptString result;
+    QScriptStringPrivate *p = new QScriptStringPrivate(this, name, QScriptStringPrivate::HeapAllocated);
+    QScriptStringPrivate::init(result, p);
+    registerScriptString(p);
+    return result;
+}
+#ifdef QT_NO_QOBJECT
+QScriptEngine::QScriptEngine()
+    : d_ptr(new QScriptEnginePrivate)
+{
+    d_ptr->q_ptr = this;
+}
+/*! \internal
+*/
+QScriptEngine::QScriptEngine(QScriptEnginePrivate &dd)
+    : d_ptr(&dd)
+{
+    d_ptr->q_ptr = this;
+}
+#else
+/*!
+    Constructs a QScriptEngine object.
+    The globalObject() is initialized to have properties as described in
+    \l{ECMA-262}, Section 15.1.
+*/
+QScriptEngine::QScriptEngine()
+    : QObject(*new QScriptEnginePrivate, 0)
+{
+}
+/*!
+    Constructs a QScriptEngine object with the given \a parent.
+    The globalObject() is initialized to have properties as described in
+    \l{ECMA-262}, Section 15.1.
+*/
+QScriptEngine::QScriptEngine(QObject *parent)
+    : QObject(*new QScriptEnginePrivate, parent)
+{
+}
+/*! \internal
+*/
+QScriptEngine::QScriptEngine(QScriptEnginePrivate &dd, QObject *parent)
+    : QObject(dd, parent)
+{
+}
+#endif
+/*!
+  Destroys this QScriptEngine.
+*/
+QScriptEngine::~QScriptEngine()
+{
+#ifdef QT_NO_QOBJECT
+    delete d_ptr;
+    d_ptr = 0;
+#endif
+}
+/*!
+  Returns this engine's Global Object.
+  By default, the Global Object contains the built-in objects that are
+  part of \l{ECMA-262}, such as Math, Date and String. Additionally,
+  you can set properties of the Global Object to make your own
+  extensions available to all script code. Non-local variables in
+  script code will be created as properties of the Global Object, as
+  well as local variables in global code.
+*/
+QScriptValue QScriptEngine::globalObject() const
+{
+    Q_D(const QScriptEngine);
+    QScript::APIShim shim(const_cast<QScriptEnginePrivate*>(d));
+    JSC::JSObject *result = d->globalObject();
+    return const_cast<QScriptEnginePrivate*>(d)->scriptValueFromJSCValue(result);
+}
+/*!
+  \since 4.5
+  Sets this engine's Global Object to be the given \a object.
+  If \a object is not a valid script object, this function does
+  nothing.
+  When setting a custom global object, you may want to use
+  QScriptValueIterator to copy the properties of the standard Global
+  Object; alternatively, you can set the internal prototype of your
+  custom object to be the original Global Object.
+*/
+void QScriptEngine::setGlobalObject(const QScriptValue &object)
+{
+    Q_D(QScriptEngine);
+    if (!object.isObject())
+        return;
+    QScript::APIShim shim(d);
+    JSC::JSObject *jscObject = JSC::asObject(d->scriptValueToJSCValue(object));
+    d->setGlobalObject(jscObject);
+}
+/*!
+  Returns a QScriptValue of the primitive type Null.
+  \sa undefinedValue()
+*/
+QScriptValue QScriptEngine::nullValue()
+{
+    Q_D(QScriptEngine);
+    return d->scriptValueFromJSCValue(JSC::jsNull());
+}
+/*!
+  Returns a QScriptValue of the primitive type Undefined.
+  \sa nullValue()
+*/
+QScriptValue QScriptEngine::undefinedValue()
+{
+    Q_D(QScriptEngine);
+    return d->scriptValueFromJSCValue(JSC::jsUndefined());
+}
+/*!
+  Creates a constructor function from \a fun, with the given \a length.
+  The \c{prototype} property of the resulting function is set to be the
+  given \a prototype. The \c{constructor} property of \a prototype is
+  set to be the resulting function.
+  When a function is called as a constructor (e.g. \c{new Foo()}), the
+  `this' object associated with the function call is the new object
+  that the function is expected to initialize; the prototype of this
+  default constructed object will be the function's public
+  \c{prototype} property. If you always want the function to behave as
+  a constructor (e.g. \c{Foo()} should also create a new object), or
+  if you need to create your own object rather than using the default
+  `this' object, you should make sure that the prototype of your
+  object is set correctly; either by setting it manually, or, when
+  wrapping a custom type, by having registered the defaultPrototype()
+  of that type. Example:
+  \snippet doc/src/snippets/code/src_script_qscriptengine.cpp 9
+  To wrap a custom type and provide a constructor for it, you'd typically
+  do something like this:
+  \snippet doc/src/snippets/code/src_script_qscriptengine.cpp 10
+*/
+QScriptValue QScriptEngine::newFunction(QScriptEngine::FunctionSignature fun,
+                                        const QScriptValue &prototype,
+                                        int length)
+{
+    Q_D(QScriptEngine);
+    QScript::APIShim shim(d);
+    JSC::ExecState* exec = d->currentFrame;
+    JSC::JSValue function = new (exec)QScript::FunctionWrapper(exec, length, JSC::Identifier(exec, ""), fun);
+    QScriptValue result = d->scriptValueFromJSCValue(function);
+    result.setProperty(QLatin1String("prototype"), prototype, QScriptValue::Undeletable);
+    const_cast<QScriptValue&>(prototype)
+        .setProperty(QLatin1String("constructor"), result,
+                     QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+    return result;
+}
+#ifndef QT_NO_REGEXP
+/*!
+  Creates a QtScript object of class RegExp with the given
+  \a regexp.
+  \sa QScriptValue::toRegExp()
+*/
+QScriptValue QScriptEngine::newRegExp(const QRegExp &regexp)
+{
+    Q_D(QScriptEngine);
+    QScript::APIShim shim(d);
+    return d->scriptValueFromJSCValue(d->newRegExp(d->currentFrame, regexp));
+}
+#endif // QT_NO_REGEXP
+/*!
+  Creates a QtScript object holding the given variant \a value.
+  If a default prototype has been registered with the meta type id of
+  \a value, then the prototype of the created object will be that
+  prototype; otherwise, the prototype will be the Object prototype
+  object.
+  \sa setDefaultPrototype(), QScriptValue::toVariant(), reportAdditionalMemoryCost()
+*/
+QScriptValue QScriptEngine::newVariant(const QVariant &value)
+{
+    Q_D(QScriptEngine);
+    QScript::APIShim shim(d);
+    return d->scriptValueFromJSCValue(d->newVariant(value));
+}
+/*!
+  \since 4.4
+  \overload
+  Initializes the given Qt Script \a object to hold the given variant
+  \a value, and returns the \a object.
+  This function enables you to "promote" a plain Qt Script object
+  (created by the newObject() function) to a variant, or to replace
+  the variant contained inside an object previously created by the
+  newVariant() function.
+  The prototype() of the \a object will remain unchanged.
+  If \a object is not an object, this function behaves like the normal
+  newVariant(), i.e. it creates a new script object and returns it.
+  This function is useful when you want to provide a script
+  constructor for a C++ type. If your constructor is invoked in a
+  \c{new} expression (QScriptContext::isCalledAsConstructor() returns
+  true), you can pass QScriptContext::thisObject() (the default
+  constructed script object) to this function to initialize the new
+  object.
+  \sa reportAdditionalMemoryCost()
+*/
+QScriptValue QScriptEngine::newVariant(const QScriptValue &object,
+                                       const QVariant &value)
+{
+    Q_D(QScriptEngine);
+    QScript::APIShim shim(d);
+    JSC::JSValue jsObject = d->scriptValueToJSCValue(object);
+    return d->scriptValueFromJSCValue(d->newVariant(jsObject, value));
+}
+#ifndef QT_NO_QOBJECT
+/*!
+  Creates a QtScript object that wraps the given QObject \a
+  object, using the given \a ownership. The given \a options control
+  various aspects of the interaction with the resulting script object.
+  Signals and slots, properties and children of \a object are
+  available as properties of the created QScriptValue. For more
+  information, see the \l{QtScript} documentation.
+  If \a object is a null pointer, this function returns nullValue().
+  If a default prototype has been registered for the \a object's class
+  (or its superclass, recursively), the prototype of the new script
+  object will be set to be that default prototype.
+  If the given \a object is deleted outside of QtScript's control, any
+  attempt to access the deleted QObject's members through the QtScript
+  wrapper object (either by script code or C++) will result in a
+  script exception.
+  \sa QScriptValue::toQObject(), reportAdditionalMemoryCost()
+*/
+QScriptValue QScriptEngine::newQObject(QObject *object, ValueOwnership ownership,
+                                       const QObjectWrapOptions &options)
+{
+    Q_D(QScriptEngine);
+    QScript::APIShim shim(d);
+    JSC::JSValue jscQObject = d->newQObject(object, ownership, options);
+    return d->scriptValueFromJSCValue(jscQObject);
+}
+/*!
+  \since 4.4
+  \overload
+  Initializes the given \a scriptObject to hold the given \a qtObject,
+  and returns the \a scriptObject.
+  This function enables you to "promote" a plain Qt Script object
+  (created by the newObject() function) to a QObject proxy, or to
+  replace the QObject contained inside an object previously created by
+  the newQObject() function.
+  The prototype() of the \a scriptObject will remain unchanged.
+  If \a scriptObject is not an object, this function behaves like the
+  normal newQObject(), i.e. it creates a new script object and returns
+  it.
+  This function is useful when you want to provide a script
+  constructor for a QObject-based class. If your constructor is
+  invoked in a \c{new} expression
+  (QScriptContext::isCalledAsConstructor() returns true), you can pass
+  QScriptContext::thisObject() (the default constructed script object)
+  to this function to initialize the new object.
+  \sa reportAdditionalMemoryCost()
+*/
+QScriptValue QScriptEngine::newQObject(const QScriptValue &scriptObject,
+                                       QObject *qtObject,
+                                       ValueOwnership ownership,
+                                       const QObjectWrapOptions &options)
+{
+    Q_D(QScriptEngine);
+    if (!scriptObject.isObject())
+        return newQObject(qtObject, ownership, options);
+    QScript::APIShim shim(d);
+    JSC::JSObject *jscObject = JSC::asObject(QScriptValuePrivate::get(scriptObject)->jscValue);
+    if (!jscObject->inherits(&QScriptObject::info)) {
+        qWarning("QScriptEngine::newQObject(): changing class of non-QScriptObject not supported");
+        return QScriptValue();
+    }
+    QScriptObject *jscScriptObject = static_cast<QScriptObject*>(jscObject);
+    if (!scriptObject.isQObject()) {
+        jscScriptObject->setDelegate(new QScript::QObjectDelegate(qtObject, ownership, options));
+    } else {
+        QScript::QObjectDelegate *delegate = static_cast<QScript::QObjectDelegate*>(jscScriptObject->delegate());
+        delegate->setValue(qtObject);
+        delegate->setOwnership(ownership);
+        delegate->setOptions(options);
+    }
+    return scriptObject;
+}
+#endif // QT_NO_QOBJECT
+/*!
+  Creates a QtScript object of class Object.
+  The prototype of the created object will be the Object
+  prototype object.
+  \sa newArray(), QScriptValue::setProperty()
+*/
+QScriptValue QScriptEngine::newObject()
+{
+    Q_D(QScriptEngine);
+    QScript::APIShim shim(d);
+    return d->scriptValueFromJSCValue(d->newObject());
+}
+/*!
+  \since 4.4
+  \overload
+  Creates a QtScript Object of the given class, \a scriptClass.
+  The prototype of the created object will be the Object
+  prototype object.
+  \a data, if specified, is set as the internal data of the
+  new object (using QScriptValue::setData()).
+  \sa QScriptValue::scriptClass(), reportAdditionalMemoryCost()
+*/
+QScriptValue QScriptEngine::newObject(QScriptClass *scriptClass,
+                                      const QScriptValue &data)
+{
+    Q_D(QScriptEngine);
+    QScript::APIShim shim(d);
+    JSC::ExecState* exec = d->currentFrame;
+    QScriptObject *result = new (exec) QScriptObject(d->scriptObjectStructure);
+    result->setDelegate(new QScript::ClassObjectDelegate(scriptClass));
+    QScriptValue scriptObject = d->scriptValueFromJSCValue(result);
+    scriptObject.setData(data);
+    QScriptValue proto = scriptClass->prototype();
+    if (proto.isValid())
+        scriptObject.setPrototype(proto);
+    return scriptObject;
+}
+/*!
+  \internal
+*/
+QScriptValue QScriptEngine::newActivationObject()
+{
+    qWarning("QScriptEngine::newActivationObject() not implemented");
+    // ### JSActivation or JSVariableObject?
+    return QScriptValue();
+}
+/*!
+  Creates a QScriptValue that wraps a native (C++) function. \a fun
+  must be a C++ function with signature QScriptEngine::FunctionSignature.  \a
+  length is the number of arguments that \a fun expects; this becomes
+  the \c{length} property of the created QScriptValue.
+  Note that \a length only gives an indication of the number of
+  arguments that the function expects; an actual invocation of a
+  function can include any number of arguments. You can check the
+  \l{QScriptContext::argumentCount()}{argumentCount()} of the
+  QScriptContext associated with the invocation to determine the
+  actual number of arguments passed.
+  A \c{prototype} property is automatically created for the resulting
+  function object, to provide for the possibility that the function
+  will be used as a constructor.
+  By combining newFunction() and the property flags
+  QScriptValue::PropertyGetter and QScriptValue::PropertySetter, you
+  can create script object properties that behave like normal
+  properties in script code, but are in fact accessed through
+  functions (analogous to how properties work in \l{Qt's Property
+  System}). Example:
+  \snippet doc/src/snippets/code/src_script_qscriptengine.cpp 11
+  When the property \c{foo} of the script object is subsequently
+  accessed in script code, \c{getSetFoo()} will be invoked to handle
+  the access.  In this particular case, we chose to store the "real"
+  value of \c{foo} as a property of the accessor function itself; you
+  are of course free to do whatever you like in this function.
+  In the above example, a single native function was used to handle
+  both reads and writes to the property; the argument count is used to
+  determine if we are handling a read or write. You can also use two
+  separate functions; just specify the relevant flag
+  (QScriptValue::PropertyGetter or QScriptValue::PropertySetter) when
+  setting the property, e.g.:
+  \snippet doc/src/snippets/code/src_script_qscriptengine.cpp 12
+  \sa QScriptValue::call()
+*/
+QScriptValue QScriptEngine::newFunction(QScriptEngine::FunctionSignature fun, int length)
+{
+    Q_D(QScriptEngine);
+    QScript::APIShim shim(d);
+    JSC::ExecState* exec = d->currentFrame;
+    JSC::JSValue function = new (exec)QScript::FunctionWrapper(exec, length, JSC::Identifier(exec, ""), fun);
+    QScriptValue result = d->scriptValueFromJSCValue(function);
+    QScriptValue proto = newObject();
+    result.setProperty(QLatin1String("prototype"), proto, QScriptValue::Undeletable);
+    proto.setProperty(QLatin1String("constructor"), result,
+                      QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+    return result;
+}
+/*!
+  \internal
+  \since 4.4
+*/
+QScriptValue QScriptEngine::newFunction(QScriptEngine::FunctionWithArgSignature fun, void *arg)
+{
+    Q_D(QScriptEngine);
+    QScript::APIShim shim(d);
+    JSC::ExecState* exec = d->currentFrame;
+    JSC::JSValue function = new (exec)QScript::FunctionWithArgWrapper(exec, /*length=*/0, JSC::Identifier(exec, ""), fun, arg);
+    QScriptValue result = d->scriptValueFromJSCValue(function);
+    QScriptValue proto = newObject();
+    result.setProperty(QLatin1String("prototype"), proto, QScriptValue::Undeletable);
+    proto.setProperty(QLatin1String("constructor"), result,
+                      QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+    return result;
+}
+/*!
+  Creates a QtScript object of class Array with the given \a length.
+  \sa newObject()
+*/
+QScriptValue QScriptEngine::newArray(uint length)
+{
+    Q_D(QScriptEngine);
+    QScript::APIShim shim(d);
+    return d->scriptValueFromJSCValue(d->newArray(d->currentFrame, length));
+}
+/*!
+  Creates a QtScript object of class RegExp with the given
+  \a pattern and \a flags.
+  The legal flags are 'g' (global), 'i' (ignore case), and 'm'
+  (multiline).
+*/
+QScriptValue QScriptEngine::newRegExp(const QString &pattern, const QString &flags)
+{
+    Q_D(QScriptEngine);
+    QScript::APIShim shim(d);
+    return d->scriptValueFromJSCValue(d->newRegExp(d->currentFrame, pattern, flags));
+}
 …
+{
     Q_D(QScriptEngine);
+    JSC::ExecState* exec = d->currentFrame;
+    JSC::JSValue val = JSC::jsNumber(exec, value);
+    JSC::ArgList args(&val, 1);
+    JSC::JSObject *result = JSC::constructDate(exec, args);
+    return d->scriptValueFromJSCValue(result);
+    QScript::APIShim shim(d);
+    return d->scriptValueFromJSCValue(d->newDate(d->currentFrame, value));
+}
 …
 QScriptValue QScriptEngine::newDate(const QDateTime &value)
+{
+    return newDate(QScript::FromDateTime(value));
+    Q_D(QScriptEngine);
+    QScript::APIShim shim(d);
+    return d->scriptValueFromJSCValue(d->newDate(d->currentFrame, value));
+}
 …
+{
     Q_D(QScriptEngine);
+    QScript::APIShim shim(d);
     JSC::JSValue jscCtor = d->scriptValueToJSCValue(ctor);
     JSC::JSValue jscQMetaObject = d->newQMetaObject(metaObject, jscCtor);
 …
+{
     Q_D(QScriptEngine);
+    QScript::APIShim shim(d);
     WTF::PassRefPtr<QScript::UStringSourceProviderWithFeedback> provider
             = QScript::UStringSourceProviderWithFeedback::create(program, fileName, lineNumber, d);
 …
     JSC::ExecState* exec = d->currentFrame;
     JSC::EvalExecutable executable(exec, source);
+    WTF::RefPtr<JSC::EvalExecutable> executable = JSC::EvalExecutable::create(exec, source);
     bool compile = true;
+    return d->scriptValueFromJSCValue(d->evaluateHelper(exec, sourceId, &executable, compile));
+}
+/*!
+  \internal
+  \since 4.6
+    return d->scriptValueFromJSCValue(d->evaluateHelper(exec, sourceId, executable.get(), compile));
+}
+/*!
+  \since 4.7
   Evaluates the given \a program and returns the result of the
 …
         return QScriptValue();
+    QScript::APIShim shim(d);
     JSC::ExecState* exec = d->currentFrame;
     JSC::EvalExecutable *executable = program_d->executable(exec, d);
 …
+{
     Q_D(QScriptEngine);
+    QScript::APIShim shim(d);
     JSC::CallFrame* newFrame = d->pushContext(d->currentFrame, d->currentFrame->globalData().dynamicGlobalObject,
 …
             newCallFrame->init(0, /*vPC=*/0, exec->scopeChain(), exec, flags | ShouldRestoreCallFrame, argc, callee);
         } else {
+            JSC::JSObject *jscObject = originalGlobalObject();
+            JSC::ScopeChainNode *scn = new JSC::ScopeChainNode(0, jscObject, &exec->globalData(), jscObject);
+            newCallFrame->init(0, /*vPC=*/0, scn, exec, flags | ShouldRestoreCallFrame, argc, callee);
+            newCallFrame->init(0, /*vPC=*/0, globalExec()->scopeChain(), exec, flags | ShouldRestoreCallFrame, argc, callee);
+        }
     } else {
 …
         agent()->contextPop();
     Q_D(QScriptEngine);
+    QScript::APIShim shim(d);
     if (d->currentFrame->returnPC() != 0 || d->currentFrame->codeBlock() != 0
         || !currentContext()->parentContext()) {
 …
   The exception state is cleared when evaluate() is called.
+  \sa uncaughtException(), uncaughtExceptionLineNumber(),
+      uncaughtExceptionBacktrace()
+  \sa uncaughtException(), uncaughtExceptionLineNumber()
 */
 bool QScriptEngine::hasUncaughtException() const
 …
   \sa hasUncaughtException(), uncaughtExceptionLineNumber(),
-      uncaughtExceptionBacktrace()
 */
 QScriptValue QScriptEngine::uncaughtException() const
 …
   the second argument to evaluate().
   \sa hasUncaughtException(), uncaughtExceptionBacktrace()
+  \sa hasUncaughtException()
 */
 int QScriptEngine::uncaughtExceptionLineNumber() const
 …
   Returns a human-readable backtrace of the last uncaught exception.
   Each line is of the form \c{<function-name>(<arguments>)@<file-name>:<line-number>}.
+  It is in the form \c{<function-name>()@<file-name>:<line-number>}.
   \sa uncaughtException()
 …
+{
     Q_D(QScriptEngine);
     return d->create(type, ptr);
+}
+QScriptValue QScriptEnginePrivate::create(int type, const void *ptr)
+{
+    Q_Q(QScriptEngine);
+    QScript::APIShim shim(d);
+    return d->scriptValueFromJSCValue(d->create(d->currentFrame, type, ptr));
+}
+JSC::JSValue QScriptEnginePrivate::create(JSC::ExecState *exec, int type, const void *ptr)
+{
     Q_ASSERT(ptr != 0);
+    QScriptValue result;
+    QScriptTypeInfo *info = m_typeInfos.value(type);
+    JSC::JSValue result;
+    QScriptEnginePrivate *eng = exec ? QScript::scriptEngineFromExec(exec) : 0;
+    QScriptTypeInfo *info = eng ? eng->m_typeInfos.value(type) : 0;
     if (info && info->marshal) {
         result = info->marshal(q, ptr);
+        result = eng->scriptValueToJSCValue(info->marshal(eng->q_func(), ptr));
     } else {
         // check if it's one of the types we know
         switch (QMetaType::Type(type)) {
         case QMetaType::Void:
             return QScriptValue(q, QScriptValue::UndefinedValue);
+            return JSC::jsUndefined();
         case QMetaType::Bool:
             return QScriptValue(q, *reinterpret_cast<const bool*>(ptr));
+            return JSC::jsBoolean(*reinterpret_cast<const bool*>(ptr));
         case QMetaType::Int:
             return QScriptValue(q, *reinterpret_cast<const int*>(ptr));
+            return JSC::jsNumber(exec, *reinterpret_cast<const int*>(ptr));
         case QMetaType::UInt:
             return QScriptValue(q, *reinterpret_cast<const uint*>(ptr));
+            return JSC::jsNumber(exec, *reinterpret_cast<const uint*>(ptr));
         case QMetaType::LongLong:
             return QScriptValue(q, qsreal(*reinterpret_cast<const qlonglong*>(ptr)));
+            return JSC::jsNumber(exec, qsreal(*reinterpret_cast<const qlonglong*>(ptr)));
         case QMetaType::ULongLong:
 #if defined(Q_OS_WIN) && defined(_MSC_FULL_VER) && _MSC_FULL_VER <= 12008804
 #pragma message("** NOTE: You need the Visual Studio Processor Pack to compile support for 64bit unsigned integers.")
             return QScriptValue(q, qsreal((qlonglong)*reinterpret_cast<const qulonglong*>(ptr)));
+            return JSC::jsNumber(exec, qsreal((qlonglong)*reinterpret_cast<const qulonglong*>(ptr)));
 #elif defined(Q_CC_MSVC) && !defined(Q_CC_MSVC_NET)
             return QScriptValue(q, qsreal((qlonglong)*reinterpret_cast<const qulonglong*>(ptr)));
+            return JSC::jsNumber(exec, qsreal((qlonglong)*reinterpret_cast<const qulonglong*>(ptr)));
 #else
             return QScriptValue(q, qsreal(*reinterpret_cast<const qulonglong*>(ptr)));
+            return JSC::jsNumber(exec, qsreal(*reinterpret_cast<const qulonglong*>(ptr)));
 #endif
         case QMetaType::Double:
             return QScriptValue(q, qsreal(*reinterpret_cast<const double*>(ptr)));
+            return JSC::jsNumber(exec, qsreal(*reinterpret_cast<const double*>(ptr)));
         case QMetaType::QString:
             return QScriptValue(q, *reinterpret_cast<const QString*>(ptr));
+            return JSC::jsString(exec, *reinterpret_cast<const QString*>(ptr));
         case QMetaType::Float:
             return QScriptValue(q, *reinterpret_cast<const float*>(ptr));
+            return JSC::jsNumber(exec, *reinterpret_cast<const float*>(ptr));
         case QMetaType::Short:
             return QScriptValue(q, *reinterpret_cast<const short*>(ptr));
+            return JSC::jsNumber(exec, *reinterpret_cast<const short*>(ptr));
         case QMetaType::UShort:
             return QScriptValue(q, *reinterpret_cast<const unsigned short*>(ptr));
+            return JSC::jsNumber(exec, *reinterpret_cast<const unsigned short*>(ptr));
         case QMetaType::Char:
             return QScriptValue(q, *reinterpret_cast<const char*>(ptr));
+            return JSC::jsNumber(exec, *reinterpret_cast<const char*>(ptr));
         case QMetaType::UChar:
             return QScriptValue(q, *reinterpret_cast<const unsigned char*>(ptr));
+            return JSC::jsNumber(exec, *reinterpret_cast<const unsigned char*>(ptr));
         case QMetaType::QChar:
             return QScriptValue(q, (*reinterpret_cast<const QChar*>(ptr)).unicode());
+            return JSC::jsNumber(exec, (*reinterpret_cast<const QChar*>(ptr)).unicode());
         case QMetaType::QStringList:
             result = arrayFromStringList(*reinterpret_cast<const QStringList *>(ptr));
+            result = arrayFromStringList(exec, *reinterpret_cast<const QStringList *>(ptr));
             break;
         case QMetaType::QVariantList:
             result = arrayFromVariantList(*reinterpret_cast<const QVariantList *>(ptr));
+            result = arrayFromVariantList(exec, *reinterpret_cast<const QVariantList *>(ptr));
             break;
         case QMetaType::QVariantMap:
             result = objectFromVariantMap(*reinterpret_cast<const QVariantMap *>(ptr));
+            result = objectFromVariantMap(exec, *reinterpret_cast<const QVariantMap *>(ptr));
             break;
         case QMetaType::QDateTime:
             result = q->newDate(*reinterpret_cast<const QDateTime *>(ptr));
+            result = newDate(exec, *reinterpret_cast<const QDateTime *>(ptr));
             break;
         case QMetaType::QDate:
             result = q->newDate(QDateTime(*reinterpret_cast<const QDate *>(ptr)));
+            result = newDate(exec, QDateTime(*reinterpret_cast<const QDate *>(ptr)));
             break;
 #ifndef QT_NO_REGEXP
         case QMetaType::QRegExp:
             result = q->newRegExp(*reinterpret_cast<const QRegExp *>(ptr));
+            result = newRegExp(exec, *reinterpret_cast<const QRegExp *>(ptr));
             break;
 #endif
 …
         case QMetaType::QObjectStar:
         case QMetaType::QWidgetStar:
             result = q->newQObject(*reinterpret_cast<QObject* const *>(ptr));
+            result = eng->newQObject(*reinterpret_cast<QObject* const *>(ptr));
             break;
 #endif
+        case QMetaType::QVariant:
+            result = jscValueFromVariant(exec, *reinterpret_cast<const QVariant*>(ptr));
+            break;
         default:
             if (type == qMetaTypeId<QScriptValue>()) {
                 result = *reinterpret_cast<const QScriptValue*>(ptr);
                 if (!result.isValid())
                     return QScriptValue(q, QScriptValue::UndefinedValue);
+                result = eng->scriptValueToJSCValue(*reinterpret_cast<const QScriptValue*>(ptr));
+                if (!result)
+                    return JSC::jsUndefined();
+            }
 …
             // lazy registration of some common list types
             else if (type == qMetaTypeId<QObjectList>()) {
                 qScriptRegisterSequenceMetaType<QObjectList>(q);
                 return create(type, ptr);
+                qScriptRegisterSequenceMetaType<QObjectList>(eng->q_func());
+                return create(exec, type, ptr);
+            }
 #endif
             else if (type == qMetaTypeId<QList<int> >()) {
                 qScriptRegisterSequenceMetaType<QList<int> >(q);
                 return create(type, ptr);
+                qScriptRegisterSequenceMetaType<QList<int> >(eng->q_func());
+                return create(exec, type, ptr);
+            }
             else {
                 QByteArray typeName = QMetaType::typeName(type);
-                if (typeName == "QVariant")
-                    result = scriptValueFromVariant(*reinterpret_cast<const QVariant*>(ptr));
                 if (typeName.endsWith('*') && !*reinterpret_cast<void* const *>(ptr))
                     return QScriptValue(q, QScriptValue::NullValue);
+                    return JSC::jsNull();
                 else
                     result = q->newVariant(QVariant(type, ptr));
+                    result = eng->newVariant(QVariant(type, ptr));
+            }
+        }
+    }
     if (result.isObject() && info && info->prototype
         && JSC::JSValue::strictEqual(scriptValueToJSCValue(result.prototype()), originalGlobalObject()->objectPrototype())) {
         result.setPrototype(scriptValueFromJSCValue(info->prototype));
+    if (result && result.isObject() && info && info->prototype
+        && JSC::JSValue::strictEqual(exec, JSC::asObject(result)->prototype(), eng->originalGlobalObject()->objectPrototype())) {
+        JSC::asObject(result)->setPrototype(info->prototype);
+    }
     return result;
+}
+bool QScriptEnginePrivate::convert(const QScriptValue &value,
+                                   int type, void *ptr,
+                                   QScriptEnginePrivate *eng)
+{
+    if (!eng)
+        eng = QScriptValuePrivate::getEngine(value);
+bool QScriptEnginePrivate::convertValue(JSC::ExecState *exec, JSC::JSValue value,
+                                        int type, void *ptr)
+{
+    QScriptEnginePrivate *eng = exec ? QScript::scriptEngineFromExec(exec) : 0;
     if (eng) {
         QScriptTypeInfo *info = eng->m_typeInfos.value(type);
         if (info && info->demarshal) {
             info->demarshal(value, ptr);
+            info->demarshal(eng->scriptValueFromJSCValue(value), ptr);
             return true;
+        }
 …
     switch (QMetaType::Type(type)) {
     case QMetaType::Bool:
         *reinterpret_cast<bool*>(ptr) = value.toBoolean();
+        *reinterpret_cast<bool*>(ptr) = toBool(exec, value);
         return true;
     case QMetaType::Int:
         *reinterpret_cast<int*>(ptr) = value.toInt32();
+        *reinterpret_cast<int*>(ptr) = toInt32(exec, value);
         return true;
     case QMetaType::UInt:
         *reinterpret_cast<uint*>(ptr) = value.toUInt32();
+        *reinterpret_cast<uint*>(ptr) = toUInt32(exec, value);
         return true;
     case QMetaType::LongLong:
         *reinterpret_cast<qlonglong*>(ptr) = qlonglong(value.toInteger());
+        *reinterpret_cast<qlonglong*>(ptr) = qlonglong(toInteger(exec, value));
         return true;
     case QMetaType::ULongLong:
         *reinterpret_cast<qulonglong*>(ptr) = qulonglong(value.toInteger());
+        *reinterpret_cast<qulonglong*>(ptr) = qulonglong(toInteger(exec, value));
         return true;
     case QMetaType::Double:
         *reinterpret_cast<double*>(ptr) = value.toNumber();
+        *reinterpret_cast<double*>(ptr) = toNumber(exec, value);
         return true;
     case QMetaType::QString:
 …
             *reinterpret_cast<QString*>(ptr) = QString();
         else
             *reinterpret_cast<QString*>(ptr) = value.toString();
+            *reinterpret_cast<QString*>(ptr) = toString(exec, value);
         return true;
     case QMetaType::Float:
         *reinterpret_cast<float*>(ptr) = value.toNumber();
+        *reinterpret_cast<float*>(ptr) = toNumber(exec, value);
         return true;
     case QMetaType::Short:
         *reinterpret_cast<short*>(ptr) = short(value.toInt32());
+        *reinterpret_cast<short*>(ptr) = short(toInt32(exec, value));
         return true;
     case QMetaType::UShort:
         *reinterpret_cast<unsigned short*>(ptr) = value.toUInt16();
+        *reinterpret_cast<unsigned short*>(ptr) = QScript::ToUInt16(toNumber(exec, value));
         return true;
     case QMetaType::Char:
         *reinterpret_cast<char*>(ptr) = char(value.toInt32());
+        *reinterpret_cast<char*>(ptr) = char(toInt32(exec, value));
         return true;
     case QMetaType::UChar:
         *reinterpret_cast<unsigned char*>(ptr) = (unsigned char)(value.toInt32());
+        *reinterpret_cast<unsigned char*>(ptr) = (unsigned char)(toInt32(exec, value));
         return true;
     case QMetaType::QChar:
         if (value.isString()) {
             QString str = value.toString();
+            QString str = toString(exec, value);
             *reinterpret_cast<QChar*>(ptr) = str.isEmpty() ? QChar() : str.at(0);
         } else {
             *reinterpret_cast<QChar*>(ptr) = QChar(value.toUInt16());
+            *reinterpret_cast<QChar*>(ptr) = QChar(QScript::ToUInt16(toNumber(exec, value)));
+        }
         return true;
     case QMetaType::QDateTime:
         if (value.isDate()) {
             *reinterpret_cast<QDateTime *>(ptr) = value.toDateTime();
+        if (isDate(value)) {
+            *reinterpret_cast<QDateTime *>(ptr) = toDateTime(exec, value);
             return true;
         } break;
     case QMetaType::QDate:
         if (value.isDate()) {
             *reinterpret_cast<QDate *>(ptr) = value.toDateTime().date();
+        if (isDate(value)) {
+            *reinterpret_cast<QDate *>(ptr) = toDateTime(exec, value).date();
             return true;
         } break;
 #ifndef QT_NO_REGEXP
     case QMetaType::QRegExp:
         if (value.isRegExp()) {
             *reinterpret_cast<QRegExp *>(ptr) = value.toRegExp();
+        if (isRegExp(value)) {
+            *reinterpret_cast<QRegExp *>(ptr) = toRegExp(exec, value);
             return true;
         } break;
 …
 #ifndef QT_NO_QOBJECT
     case QMetaType::QObjectStar:
         if (value.isQObject() || value.isNull()) {
             *reinterpret_cast<QObject* *>(ptr) = value.toQObject();
+        if (isQObject(value) || value.isNull()) {
+            *reinterpret_cast<QObject* *>(ptr) = toQObject(exec, value);
             return true;
         } break;
     case QMetaType::QWidgetStar:
         if (value.isQObject() || value.isNull()) {
             QObject *qo = value.toQObject();
+        if (isQObject(value) || value.isNull()) {
+            QObject *qo = toQObject(exec, value);
             if (!qo || qo->isWidgetType()) {
                 *reinterpret_cast<QWidget* *>(ptr) = reinterpret_cast<QWidget*>(qo);
 …
 #endif
     case QMetaType::QStringList:
         if (value.isArray()) {
             *reinterpret_cast<QStringList *>(ptr) = stringListFromArray(value);
+        if (isArray(value)) {
+            *reinterpret_cast<QStringList *>(ptr) = stringListFromArray(exec, value);
             return true;
         } break;
     case QMetaType::QVariantList:
         if (value.isArray()) {
             *reinterpret_cast<QVariantList *>(ptr) = variantListFromArray(value);
+        if (isArray(value)) {
+            *reinterpret_cast<QVariantList *>(ptr) = variantListFromArray(exec, JSC::asArray(value));
             return true;
         } break;
     case QMetaType::QVariantMap:
         if (value.isObject()) {
             *reinterpret_cast<QVariantMap *>(ptr) = variantMapFromObject(value);
+        if (isObject(value)) {
+            *reinterpret_cast<QVariantMap *>(ptr) = variantMapFromObject(exec, JSC::asObject(value));
             return true;
         } break;
+    case QMetaType::QVariant:
+        *reinterpret_cast<QVariant*>(ptr) = toVariant(exec, value);
+        return true;
     default:
+    ;
 …
     QByteArray name = QMetaType::typeName(type);
 #ifndef QT_NO_QOBJECT
     if (convertToNativeQObject(value, name, reinterpret_cast<void* *>(ptr)))
+    if (convertToNativeQObject(exec, value, name, reinterpret_cast<void* *>(ptr)))
         return true;
 #endif
     if (value.isVariant() && name.endsWith('*')) {
+    if (isVariant(value) && name.endsWith('*')) {
         int valueType = QMetaType::type(name.left(name.size()-1));
         QVariant &var = QScriptValuePrivate::get(value)->variantValue();
+        QVariant &var = variantValue(value);
         if (valueType == var.userType()) {
             *reinterpret_cast<void* *>(ptr) = var.data();
 …
         } else {
             // look in the prototype chain
             QScriptValue proto = value.prototype();
+            JSC::JSValue proto = JSC::asObject(value)->prototype();
             while (proto.isObject()) {
                 bool canCast = false;
                 if (proto.isVariant()) {
                     canCast = (type == proto.toVariant().userType())
                               || (valueType && (valueType == proto.toVariant().userType()));
+                if (isVariant(proto)) {
+                    canCast = (type == variantValue(proto).userType())
+                              || (valueType && (valueType == variantValue(proto).userType()));
+                }
 #ifndef QT_NO_QOBJECT
                 else if (proto.isQObject()) {
+                else if (isQObject(proto)) {
                     QByteArray className = name.left(name.size()-1);
                     if (QObject *qobject = proto.toQObject())
+                    if (QObject *qobject = toQObject(exec, proto))
                         canCast = qobject->qt_metacast(className) != 0;
+                }
 …
                     return true;
+                }
                 proto = proto.prototype();
+                proto = JSC::asObject(proto)->prototype();
+            }
+        }
 …
         if (!eng)
             return false;
+        *reinterpret_cast<QScriptValue*>(ptr) = value;
+        return true;
+    } else if (name == "QVariant") {
+        *reinterpret_cast<QVariant*>(ptr) = value.toVariant();
+        *reinterpret_cast<QScriptValue*>(ptr) = eng->scriptValueFromJSCValue(value);
         return true;
+    }
 …
             return false;
         qScriptRegisterSequenceMetaType<QObjectList>(eng->q_func());
         return convert(value, type, ptr, eng);
+        return convertValue(exec, value, type, ptr);
+    }
 #endif
 …
             return false;
         qScriptRegisterSequenceMetaType<QList<int> >(eng->q_func());
         return convert(value, type, ptr, eng);
+        return convertValue(exec, value, type, ptr);
+    }
 …
+}
+bool QScriptEnginePrivate::convertNumber(qsreal value, int type, void *ptr)
+{
+    switch (QMetaType::Type(type)) {
+    case QMetaType::Bool:
+        *reinterpret_cast<bool*>(ptr) = QScript::ToBool(value);
+        return true;
+    case QMetaType::Int:
+        *reinterpret_cast<int*>(ptr) = QScript::ToInt32(value);
+        return true;
+    case QMetaType::UInt:
+        *reinterpret_cast<uint*>(ptr) = QScript::ToUInt32(value);
+        return true;
+    case QMetaType::LongLong:
+        *reinterpret_cast<qlonglong*>(ptr) = qlonglong(QScript::ToInteger(value));
+        return true;
+    case QMetaType::ULongLong:
+        *reinterpret_cast<qulonglong*>(ptr) = qulonglong(QScript::ToInteger(value));
+        return true;
+    case QMetaType::Double:
+        *reinterpret_cast<double*>(ptr) = value;
+        return true;
+    case QMetaType::QString:
+        *reinterpret_cast<QString*>(ptr) = QScript::ToString(value);
+        return true;
+    case QMetaType::Float:
+        *reinterpret_cast<float*>(ptr) = value;
+        return true;
+    case QMetaType::Short:
+        *reinterpret_cast<short*>(ptr) = short(QScript::ToInt32(value));
+        return true;
+    case QMetaType::UShort:
+        *reinterpret_cast<unsigned short*>(ptr) = QScript::ToUInt16(value);
+        return true;
+    case QMetaType::Char:
+        *reinterpret_cast<char*>(ptr) = char(QScript::ToInt32(value));
+        return true;
+    case QMetaType::UChar:
+        *reinterpret_cast<unsigned char*>(ptr) = (unsigned char)(QScript::ToInt32(value));
+        return true;
+    case QMetaType::QChar:
+        *reinterpret_cast<QChar*>(ptr) = QChar(QScript::ToUInt16(value));
+        return true;
+    default:
+        break;
+    }
+    return false;
+}
+bool QScriptEnginePrivate::convertString(const QString &value, int type, void *ptr)
+{
+    switch (QMetaType::Type(type)) {
+    case QMetaType::Bool:
+        *reinterpret_cast<bool*>(ptr) = QScript::ToBool(value);
+        return true;
+    case QMetaType::Int:
+        *reinterpret_cast<int*>(ptr) = QScript::ToInt32(value);
+        return true;
+    case QMetaType::UInt:
+        *reinterpret_cast<uint*>(ptr) = QScript::ToUInt32(value);
+        return true;
+    case QMetaType::LongLong:
+        *reinterpret_cast<qlonglong*>(ptr) = qlonglong(QScript::ToInteger(value));
+        return true;
+    case QMetaType::ULongLong:
+        *reinterpret_cast<qulonglong*>(ptr) = qulonglong(QScript::ToInteger(value));
+        return true;
+    case QMetaType::Double:
+        *reinterpret_cast<double*>(ptr) = QScript::ToNumber(value);
+        return true;
+    case QMetaType::QString:
+        *reinterpret_cast<QString*>(ptr) = value;
+        return true;
+    case QMetaType::Float:
+        *reinterpret_cast<float*>(ptr) = QScript::ToNumber(value);
+        return true;
+    case QMetaType::Short:
+        *reinterpret_cast<short*>(ptr) = short(QScript::ToInt32(value));
+        return true;
+    case QMetaType::UShort:
+        *reinterpret_cast<unsigned short*>(ptr) = QScript::ToUInt16(value);
+        return true;
+    case QMetaType::Char:
+        *reinterpret_cast<char*>(ptr) = char(QScript::ToInt32(value));
+        return true;
+    case QMetaType::UChar:
+        *reinterpret_cast<unsigned char*>(ptr) = (unsigned char)(QScript::ToInt32(value));
+        return true;
+    case QMetaType::QChar:
+        *reinterpret_cast<QChar*>(ptr) = QChar(QScript::ToUInt16(value));
+        return true;
+    default:
+        break;
+    }
+    return false;
+}
 bool QScriptEnginePrivate::hasDemarshalFunction(int type) const
+{
 …
+}
+JSC::UString QScriptEnginePrivate::translationContextFromUrl(const JSC::UString &url)
+{
+    if (url != cachedTranslationUrl) {
+        cachedTranslationContext = QFileInfo(url).baseName();
+        cachedTranslationUrl = url;
+    }
+    return cachedTranslationContext;
+}
 /*!
     \internal
 …
+{
     Q_D(QScriptEngine);
+    return QScriptEnginePrivate::convert(value, type, ptr, d);
+    QScript::APIShim shim(d);
+    return QScriptEnginePrivate::convertValue(d->currentFrame, d->scriptValueToJSCValue(value), type, ptr);
+}
 …
 bool QScriptEngine::convertV2(const QScriptValue &value, int type, void *ptr)
+{
+    return QScriptEnginePrivate::convert(value, type, ptr, /*engine=*/0);
+    QScriptValuePrivate *vp = QScriptValuePrivate::get(value);
+    if (vp) {
+        switch (vp->type) {
+        case QScriptValuePrivate::JavaScriptCore: {
+            if (vp->engine) {
+                QScript::APIShim shim(vp->engine);
+                return QScriptEnginePrivate::convertValue(vp->engine->currentFrame, vp->jscValue, type, ptr);
+            } else {
+                return QScriptEnginePrivate::convertValue(0, vp->jscValue, type, ptr);
+            }
+        }
+        case QScriptValuePrivate::Number:
+            return QScriptEnginePrivate::convertNumber(vp->numberValue, type, ptr);
+        case QScriptValuePrivate::String:
+            return QScriptEnginePrivate::convertString(vp->stringValue, type, ptr);
+        }
+    }
+    return false;
+}
 …
+{
     Q_D(QScriptEngine);
+    QScript::APIShim shim(d);
     QScriptTypeInfo *info = d->m_typeInfos.value(type);
     if (!info) {
 …
     \row    \o qsTranslate() \o QCoreApplication::translate()
     \row    \o QT_TRANSLATE_NOOP() \o QT_TRANSLATE_NOOP()
+    \row    \o qsTrId() (since 4.7) \o qtTrId()
+    \row    \o QT_TRID_NOOP() (since 4.7) \o QT_TRID_NOOP()
     \endtable
 …
+{
     Q_D(QScriptEngine);
+    QScript::APIShim shim(d);
     JSC::ExecState* exec = d->currentFrame;
     JSC::JSValue jscObject = d->scriptValueToJSCValue(object);
 …
     JSC::asObject(jscObject)->putDirectFunction(exec, new (exec)JSC::NativeFunctionWrapper(exec, glob->prototypeFunctionStructure(), 5, JSC::Identifier(exec, "qsTranslate"), QScript::functionQsTranslate));
     JSC::asObject(jscObject)->putDirectFunction(exec, new (exec)JSC::NativeFunctionWrapper(exec, glob->prototypeFunctionStructure(), 2, JSC::Identifier(exec, "QT_TRANSLATE_NOOP"), QScript::functionQsTranslateNoOp));
     JSC::asObject(jscObject)->putDirectFunction(exec, new (exec)JSC::PrototypeFunction(exec, glob->prototypeFunctionStructure(), 3, JSC::Identifier(exec, "qsTr"), QScript::functionQsTr));
+    JSC::asObject(jscObject)->putDirectFunction(exec, new (exec)JSC::NativeFunctionWrapper(exec, glob->prototypeFunctionStructure(), 3, JSC::Identifier(exec, "qsTr"), QScript::functionQsTr));
     JSC::asObject(jscObject)->putDirectFunction(exec, new (exec)JSC::NativeFunctionWrapper(exec, glob->prototypeFunctionStructure(), 1, JSC::Identifier(exec, "QT_TR_NOOP"), QScript::functionQsTrNoOp));
+    JSC::asObject(jscObject)->putDirectFunction(exec, new (exec)JSC::NativeFunctionWrapper(exec, glob->prototypeFunctionStructure(), 1, JSC::Identifier(exec, "qsTrId"), QScript::functionQsTrId));
+    JSC::asObject(jscObject)->putDirectFunction(exec, new (exec)JSC::NativeFunctionWrapper(exec, glob->prototypeFunctionStructure(), 1, JSC::Identifier(exec, "QT_TRID_NOOP"), QScript::functionQsTrIdNoOp));
     glob->stringPrototype()->putDirectFunction(exec, new (exec)JSC::NativeFunctionWrapper(exec, glob->prototypeFunctionStructure(), 1, JSC::Identifier(exec, "arg"), QScript::stringProtoFuncArg));
 …
 #else
     Q_D(QScriptEngine);
+    QScript::APIShim shim(d);
     if (d->importedExtensions.contains(extension))
         return undefinedValue(); // already imported
 …
   request that garbage collection should be performed as soon as
   possible.
+  \sa reportAdditionalMemoryCost()
 */
 void QScriptEngine::collectGarbage()
 …
     Q_D(QScriptEngine);
     d->collectGarbage();
+}
+/*!
+  \since 4.7
+  Reports an additional memory cost of the given \a size, measured in
+  bytes, to the garbage collector.
+  This function can be called to indicate that a Qt Script object has
+  memory associated with it that isn't managed by Qt Script itself.
+  Reporting the additional cost makes it more likely that the garbage
+  collector will be triggered.
+  Note that if the additional memory is shared with objects outside
+  the scripting environment, the cost should not be reported, since
+  collecting the Qt Script object would not cause the memory to be
+  freed anyway.
+  Negative \a size values are ignored, i.e. this function can't be
+  used to report that the additional memory has been deallocated.
+  \sa collectGarbage()
+*/
+void QScriptEngine::reportAdditionalMemoryCost(int size)
+{
+    Q_D(QScriptEngine);
+    d->reportAdditionalMemoryCost(size);
+}
 …
+{
     Q_D(QScriptEngine);
+    if (!isEvaluating())
+        return;
+    d->abortResult = result;
     d->timeoutChecker()->setShouldAbort(true);
     d->abortResult = result;
+    JSC::throwError(d->currentFrame, JSC::createInterruptedExecutionException(&d->currentFrame->globalData()).toObject(d->currentFrame));
+}
 …
         return false;
     QScriptEnginePrivate *engine = QScriptEnginePrivate::get(function.engine());
+    QScript::APIShim shim(engine);
     JSC::JSValue jscReceiver = engine->scriptValueToJSCValue(receiver);
     JSC::JSValue jscFunction = engine->scriptValueToJSCValue(function);
 …
         return false;
     QScriptEnginePrivate *engine = QScriptEnginePrivate::get(function.engine());
+    QScript::APIShim shim(engine);
     JSC::JSValue jscReceiver = engine->scriptValueToJSCValue(receiver);
     JSC::JSValue jscFunction = engine->scriptValueToJSCValue(function);
 …
         return;
+    }
+    QScript::APIShim shim(d);
     if (d->activeAgent)
         QScriptEngineAgentPrivate::get(d->activeAgent)->detach();
 …
+{
     Q_D(QScriptEngine);
+    QScriptString result;
+    QScriptStringPrivate *p = new QScriptStringPrivate(d, JSC::Identifier(d->currentFrame, str), QScriptStringPrivate::HeapAllocated);
+    QScriptStringPrivate::init(result, p);
+    d->registerScriptString(p);
+    return result;
+    QScript::APIShim shim(d);
+    return d->toStringHandle(JSC::Identifier(d->currentFrame, str));
+}
 …
+{
     Q_D(QScriptEngine);
+    QScript::APIShim shim(d);
     JSC::JSValue jscValue = d->scriptValueToJSCValue(value);
     if (!jscValue || jscValue.isUndefined() || jscValue.isNull())
 …
 #endif
+#ifdef Q_CC_MSVC
+// Try to prevent compiler from crashing.
+#pragma optimize("", off)
+#endif
 QT_END_NAMESPACE

trunk/src/script/api/qscriptengine.h

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
         SkipMethodsInEnumeration = 0x0008,
         ExcludeDeleteLater = 0x0010,
+        ExcludeSlots = 0x0020,
         AutoCreateDynamicProperties = 0x0100,
 …
     void collectGarbage();
+    void reportAdditionalMemoryCost(int size);
     void setProcessEventsInterval(int interval);

trunk/src/script/api/qscriptengine_p.h

-              r769
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
 #include "private/qobject_p.h"
+#include <QtCore/qdatetime.h>
 #include <QtCore/qhash.h>
+#include <QtCore/qnumeric.h>
+#include <QtCore/qregexp.h>
 #include <QtCore/qset.h>
 #include "qscriptvalue_p.h"
 #include "qscriptstring_p.h"
+#include "bridge/qscriptclassobject_p.h"
+#include "bridge/qscriptdeclarativeclass_p.h"
+#include "bridge/qscriptdeclarativeobject_p.h"
+#include "bridge/qscriptobject_p.h"
+#include "bridge/qscriptqobject_p.h"
+#include "bridge/qscriptvariant_p.h"
+#include "DateConstructor.h"
+#include "DateInstance.h"
 #include "Debugger.h"
+#include "ErrorInstance.h"
+#include "JSArray.h"
+#include "Executable.h"
 #include "Lexer.h"
 #include "RefPtr.h"
+#include "RegExpConstructor.h"
+#include "RegExpObject.h"
 #include "SourceProvider.h"
 #include "Structure.h"
+#include "UString.h"
 #include "JSGlobalObject.h"
 #include "JSValue.h"
 …
     class JSCell;
     class JSGlobalObject;
-    class UString;
+}
 …
 class QScriptSyntaxCheckResult;
 class QScriptEngine;
+class QScriptProgramPrivate;
 namespace QScript
 …
     class TimeoutCheckerProxy;
+    qint32 ToInt32(qsreal);
+    quint32 ToUInt32(qsreal);
+    quint16 ToUInt16(qsreal);
+    qsreal ToInteger(qsreal);
+    inline bool ToBool(qsreal);
+    inline bool ToBool(const QString &);
+    inline qint32 ToInt32(const QString &);
+    inline quint32 ToUInt32(const QString &);
+    inline quint16 ToUInt16(const QString &);
+    inline qsreal ToInteger(const QString &);
+#ifdef Q_CC_MSVC
+    // MSVC2008 crashes if these are inlined.
+    qsreal ToNumber(const QString &);
+    QString ToString(qsreal);
+#else
+    inline qsreal ToNumber(const QString &);
+    inline QString ToString(qsreal);
+#endif
+    QDateTime MsToDateTime(JSC::ExecState *, qsreal);
+    qsreal DateTimeToMs(JSC::ExecState *, const QDateTime &);
     //some conversion helper functions
     inline QScriptEnginePrivate *scriptEngineFromExec(const JSC::ExecState *exec);
     bool isFunction(JSC::JSValue value);
+    inline void convertToLatin1_helper(const UChar *i, int length, char *s);
+    inline QByteArray convertToLatin1(const JSC::UString &str);
     class UStringSourceProviderWithFeedback;
 …
     static QScriptEngine *get(QScriptEnginePrivate *d) { return d ? d->q_func() : 0; }
+    static bool convert(const QScriptValue &value,
+                        int type, void *ptr,
+                        QScriptEnginePrivate *eng);
+    QScriptValue create(int type, const void *ptr);
+    static inline bool isArray(JSC::JSValue);
+    static inline bool isDate(JSC::JSValue);
+    static inline bool isError(JSC::JSValue);
+    static inline bool isObject(JSC::JSValue);
+    static inline bool isRegExp(JSC::JSValue);
+    static inline bool isVariant(JSC::JSValue);
+    static inline bool isQObject(JSC::JSValue);
+    static inline bool isQMetaObject(JSC::JSValue);
+    static inline bool toBool(JSC::ExecState *, JSC::JSValue);
+    static inline qsreal toInteger(JSC::ExecState *, JSC::JSValue);
+    static inline qsreal toNumber(JSC::ExecState *, JSC::JSValue);
+    static inline qint32 toInt32(JSC::ExecState *, JSC::JSValue);
+    static inline quint32 toUInt32(JSC::ExecState *, JSC::JSValue);
+    static inline quint16 toUInt16(JSC::ExecState *, JSC::JSValue);
+    static inline JSC::UString toString(JSC::ExecState *, JSC::JSValue);
+    static inline QDateTime toDateTime(JSC::ExecState *, JSC::JSValue);
+#ifndef QT_NO_REGEXP
+    static QRegExp toRegExp(JSC::ExecState*, JSC::JSValue);
+#endif
+    static QVariant toVariant(JSC::ExecState *, JSC::JSValue);
+    static inline QObject *toQObject(JSC::ExecState *, JSC::JSValue);
+    static inline const QMetaObject *toQMetaObject(JSC::ExecState *, JSC::JSValue);
+    static inline JSC::JSValue property(JSC::ExecState*, JSC::JSValue, const JSC::Identifier &id,
+                                 int resolveMode = QScriptValue::ResolvePrototype);
+    static JSC::JSValue propertyHelper(JSC::ExecState*, JSC::JSValue, const JSC::Identifier &id, int resolveMode);
+    static inline JSC::JSValue property(JSC::ExecState*, JSC::JSValue, quint32 index,
+                                 int resolveMode = QScriptValue::ResolvePrototype);
+    static JSC::JSValue propertyHelper(JSC::ExecState*, JSC::JSValue, quint32, int resolveMode);
+    static inline JSC::JSValue property(JSC::ExecState*, JSC::JSValue, const JSC::UString &, int resolveMode);
+    static inline void setProperty(JSC::ExecState*, JSC::JSValue object, const JSC::UString &name, JSC::JSValue,
+                     const QScriptValue::PropertyFlags &flags = QScriptValue::KeepExistingFlags);
+    static void setProperty(JSC::ExecState*, JSC::JSValue object, const JSC::Identifier &id, JSC::JSValue,
+                     const QScriptValue::PropertyFlags &flags = QScriptValue::KeepExistingFlags);
+    static void setProperty(JSC::ExecState*, JSC::JSValue object, quint32 index, JSC::JSValue,
+                     const QScriptValue::PropertyFlags &flags = QScriptValue::KeepExistingFlags);
+    static QScriptValue::PropertyFlags propertyFlags(JSC::ExecState*, JSC::JSValue value,
+                                              const JSC::Identifier &id, const QScriptValue::ResolveFlags &mode);
+    static inline QScriptValue::PropertyFlags propertyFlags(JSC::ExecState*, JSC::JSValue value,
+                                              const JSC::UString &name, const QScriptValue::ResolveFlags &mode);
+    static bool convertValue(JSC::ExecState*, JSC::JSValue value,
+                             int type, void *ptr);
+    static bool convertNumber(qsreal, int type, void *ptr);
+    static bool convertString(const QString &, int type, void *ptr);
+    static JSC::JSValue create(JSC::ExecState*, int type, const void *ptr);
     bool hasDemarshalFunction(int type) const;
     inline QScriptValue scriptValueFromJSCValue(JSC::JSValue value);
     inline JSC::JSValue scriptValueToJSCValue(const QScriptValue &value);
+    QScriptValue scriptValueFromVariant(const QVariant &value);
     QVariant scriptValueToVariant(const QScriptValue &value, int targetType);
     JSC::JSValue jscValueFromVariant(const QVariant &value);
     QVariant jscValueToVariant(JSC::JSValue value, int targetType);
     QScriptValue arrayFromStringList(const QStringList &lst);
     static QStringList stringListFromArray(const QScriptValue &arr);
     QScriptValue arrayFromVariantList(const QVariantList &lst);
     static QVariantList variantListFromArray(const QScriptValue &arr);
     QScriptValue objectFromVariantMap(const QVariantMap &vmap);
     static QVariantMap variantMapFromObject(const QScriptValue &obj);
+    static inline unsigned propertyFlagsToJSCAttributes(const QScriptValue::PropertyFlags &flags);
+    static inline JSC::JSValue jscValueFromVariant(JSC::ExecState*, const QVariant &value);
+    static QVariant jscValueToVariant(JSC::ExecState*, JSC::JSValue value, int targetType);
+    static inline QVariant &variantValue(JSC::JSValue value);
+    static inline void setVariantValue(JSC::JSValue objectValue, const QVariant &value);
+    static JSC::JSValue arrayFromStringList(JSC::ExecState*, const QStringList &lst);
+    static QStringList stringListFromArray(JSC::ExecState*, JSC::JSValue arr);
+    static JSC::JSValue arrayFromVariantList(JSC::ExecState*, const QVariantList &lst);
+    static QVariantList variantListFromArray(JSC::ExecState*, JSC::JSArray *arr);
+    static JSC::JSValue objectFromVariantMap(JSC::ExecState*, const QVariantMap &vmap);
+    static QVariantMap variantMapFromObject(JSC::ExecState*, JSC::JSObject *obj);
     JSC::JSValue defaultPrototype(int metaTypeId) const;
 …
     static inline JSC::ExecState *frameForContext(QScriptContext *context);
     static inline const JSC::ExecState *frameForContext(const QScriptContext *context);
+    static inline bool hasValidCodeBlockRegister(JSC::ExecState *frame);
     JSC::JSGlobalObject *originalGlobalObject() const;
 …
     bool isCollecting() const;
     void collectGarbage();
+    void reportAdditionalMemoryCost(int size);
     //flags that we set on the return value register for native function. (ie when codeBlock is 0)
 …
     void agentDeleted(QScriptEngineAgent *agent);
+    static inline void saveException(JSC::ExecState *, JSC::JSValue *);
+    static inline void restoreException(JSC::ExecState *, JSC::JSValue);
     void setCurrentException(QScriptValue exception) { m_currentException = exception; }
     QScriptValue currentException() const { return m_currentException; }
     void clearCurrentException() { m_currentException.d_ptr.reset(); }
+    static QScriptSyntaxCheckResult checkSyntax(const QString &program);
+    static bool canEvaluate(const QString &program);
+    inline void registerScriptProgram(QScriptProgramPrivate *program);
+    inline void unregisterScriptProgram(QScriptProgramPrivate *program);
+    void detachAllRegisteredScriptPrograms();
+    inline QScriptValuePrivate *allocateScriptValuePrivate(size_t);
+    inline void freeScriptValuePrivate(QScriptValuePrivate *p);
+    inline void registerScriptValue(QScriptValuePrivate *value);
+    inline void unregisterScriptValue(QScriptValuePrivate *value);
+    void detachAllRegisteredScriptValues();
+    inline void registerScriptString(QScriptStringPrivate *value);
+    inline void unregisterScriptString(QScriptStringPrivate *value);
+    void detachAllRegisteredScriptStrings();
+    QScriptString toStringHandle(const JSC::Identifier &name);
+    static inline JSC::JSValue newArray(JSC::ExecState *, uint length);
+    static inline JSC::JSValue newDate(JSC::ExecState *, qsreal value);
+    static inline JSC::JSValue newDate(JSC::ExecState *, const QDateTime &);
+    inline JSC::JSValue newObject();
+#ifndef QT_NO_REGEXP
+    static JSC::JSValue newRegExp(JSC::ExecState *, const QRegExp &);
+#endif
+    static JSC::JSValue newRegExp(JSC::ExecState *, const QString &pattern, const QString &flags);
+    JSC::JSValue newVariant(const QVariant &);
+    JSC::JSValue newVariant(JSC::JSValue objectValue, const QVariant &);
+    static inline QScriptDeclarativeClass *declarativeClass(JSC::JSValue);
+    static inline QScriptDeclarativeClass::Object *declarativeObject(JSC::JSValue);
+    JSC::UString translationContextFromUrl(const JSC::UString &);
 #ifndef QT_NO_QOBJECT
 …
                                 JSC::JSValue ctor);
+    static QScriptSyntaxCheckResult checkSyntax(const QString &program);
+    static bool canEvaluate(const QString &program);
+    static bool convertToNativeQObject(const QScriptValue &value,
+    static bool convertToNativeQObject(JSC::ExecState*, JSC::JSValue,
                                        const QByteArray &targetType,
                                        void **result);
 …
                           JSC::JSValue function);
-    inline QScriptValuePrivate *allocateScriptValuePrivate(size_t);
-    inline void freeScriptValuePrivate(QScriptValuePrivate *p);
-    inline void registerScriptValue(QScriptValuePrivate *value);
-    inline void unregisterScriptValue(QScriptValuePrivate *value);
-    void detachAllRegisteredScriptValues();
-    inline void registerScriptString(QScriptStringPrivate *value);
-    inline void unregisterScriptString(QScriptStringPrivate *value);
-    void detachAllRegisteredScriptStrings();
     // private slots
     void _q_objectDestroyed(QObject *);
 …
     WTF::RefPtr<JSC::Structure> scriptObjectStructure;
+    WTF::RefPtr<JSC::Structure> staticScopeObjectStructure;
     QScript::QObjectPrototype *qobjectPrototype;
 …
     int freeScriptValuesCount;
     QScriptStringPrivate *registeredScriptStrings;
+    QSet<QScriptProgramPrivate*> registeredScriptPrograms;
     QHash<int, QScriptTypeInfo*> m_typeInfos;
     int processEventsInterval;
     QScriptValue abortResult;
     bool inEval;
+    JSC::UString cachedTranslationUrl;
+    JSC::UString cachedTranslationContext;
     QSet<QString> importedExtensions;
 …
     QScriptValue m_currentException;
+    QSet<JSC::JSObject*> visitedConversionObjects;
 #ifndef QT_NO_QOBJECT
     QHash<QObject*, QScript::QObjectData*> m_qobjectData;
 …
 namespace QScript
+{
+class APIShim
+{
+public:
+    APIShim(QScriptEnginePrivate *engine)
+        : m_engine(engine), m_oldTable(JSC::setCurrentIdentifierTable(engine->globalData->identifierTable))
+    {
+    }
+    ~APIShim()
+    {
+        JSC::setCurrentIdentifierTable(m_oldTable);
+    }
+private:
+    QScriptEnginePrivate *m_engine;
+    JSC::IdentifierTable *m_oldTable;
+};
 /*Helper class. Main purpose is to give debugger feedback about unloading and loading scripts.
 …
+}
+#ifndef Q_CC_MSVC
+// MSVC2008 crashes if these are inlined.
+inline QString ToString(qsreal value)
+{
+    return JSC::UString::from(value);
+}
+inline qsreal ToNumber(const QString &value)
+{
+    return ((JSC::UString)value).toDouble();
+}
+#endif
+inline qint32 ToInt32(const QString &value)
+{
+    return ToInt32(ToNumber(value));
+}
+inline quint32 ToUInt32(const QString &value)
+{
+    return ToUInt32(ToNumber(value));
+}
+inline quint16 ToUInt16(const QString &value)
+{
+    return ToUInt16(ToNumber(value));
+}
+inline qsreal ToInteger(const QString &value)
+{
+    return ToInteger(ToNumber(value));
+}
+inline bool ToBool(qsreal value)
+{
+    return (value != 0) && !qIsNaN(value);
+}
+inline bool ToBool(const QString &value)
+{
+     return !value.isEmpty();
+}
+inline void convertToLatin1_helper(const UChar *i, int length, char *s)
+{
+    const UChar *e = i + length;
+    while (i != e)
+        *(s++) = (uchar) *(i++);
+    *s = '\0';
+}
+inline QByteArray convertToLatin1(const JSC::UString &str)
+{
+    QByteArray ba(str.size(), Qt::Uninitialized);
+    convertToLatin1_helper(str.data(), str.size(), ba.data());
+    return ba;
+}
 } // namespace QScript
+inline void QScriptEnginePrivate::registerScriptProgram(QScriptProgramPrivate *program)
+{
+    Q_ASSERT(!registeredScriptPrograms.contains(program));
+    registeredScriptPrograms.insert(program);
+}
+inline void QScriptEnginePrivate::unregisterScriptProgram(QScriptProgramPrivate *program)
+{
+    Q_ASSERT(registeredScriptPrograms.contains(program));
+    registeredScriptPrograms.remove(program);
+}
 inline QScriptValuePrivate *QScriptEnginePrivate::allocateScriptValuePrivate(size_t size)
 …
     value->prev = 0;
     value->next = 0;
+}
+inline JSC::JSValue QScriptEnginePrivate::jscValueFromVariant(JSC::ExecState *exec, const QVariant &v)
+{
+    JSC::JSValue result = create(exec, v.userType(), v.data());
+    Q_ASSERT(result);
+    return result;
+}
 …
+}
+inline unsigned QScriptEnginePrivate::propertyFlagsToJSCAttributes(const QScriptValue::PropertyFlags &flags)
+{
+    unsigned attribs = 0;
+    if (flags & QScriptValue::ReadOnly)
+        attribs |= JSC::ReadOnly;
+    if (flags & QScriptValue::SkipInEnumeration)
+        attribs |= JSC::DontEnum;
+    if (flags & QScriptValue::Undeletable)
+        attribs |= JSC::DontDelete;
+    attribs |= flags & QScriptValue::UserRange;
+    return attribs;
+}
 inline QScriptValuePrivate::~QScriptValuePrivate()
+{
 …
+}
+inline QScriptValue QScriptValuePrivate::property(const QString &name, int resolveMode) const
+{
+    JSC::ExecState *exec = engine->currentFrame;
+    return property(JSC::Identifier(exec, name), resolveMode);
+}
+inline QScriptValue QScriptValuePrivate::property(const JSC::Identifier &id, int resolveMode) const
+{
+    Q_ASSERT(isObject());
+    JSC::ExecState *exec = engine->currentFrame;
+    JSC::JSObject *object = JSC::asObject(jscValue);
+inline JSC::JSValue QScriptEnginePrivate::property(JSC::ExecState *exec, JSC::JSValue value, const JSC::UString &name, int resolveMode)
+{
+    return property(exec, value, JSC::Identifier(exec, name), resolveMode);
+}
+inline JSC::JSValue QScriptEnginePrivate::property(JSC::ExecState *exec, JSC::JSValue value, const JSC::Identifier &id, int resolveMode)
+{
+    Q_ASSERT(isObject(value));
+    JSC::JSObject *object = JSC::asObject(value);
     JSC::PropertySlot slot(object);
     if ((resolveMode & QScriptValue::ResolvePrototype) && object->getPropertySlot(exec, id, slot))
+        return engine->scriptValueFromJSCValue(slot.getValue(exec, id));
+    return propertyHelper(id, resolveMode);
+}
+inline QScriptValue QScriptValuePrivate::property(quint32 index, int resolveMode) const
+{
+    Q_ASSERT(isObject());
+    JSC::ExecState *exec = engine->currentFrame;
+    JSC::JSObject *object = JSC::asObject(jscValue);
+        return slot.getValue(exec, id);
+    return propertyHelper(exec, value, id, resolveMode);
+}
+inline JSC::JSValue QScriptEnginePrivate::property(JSC::ExecState *exec, JSC::JSValue value, quint32 index, int resolveMode)
+{
+    Q_ASSERT(isObject(value));
+    JSC::JSObject *object = JSC::asObject(value);
     JSC::PropertySlot slot(object);
     if ((resolveMode & QScriptValue::ResolvePrototype) && object->getPropertySlot(exec, index, slot))
+        return engine->scriptValueFromJSCValue(slot.getValue(exec, index));
+    return propertyHelper(index, resolveMode);
+        return slot.getValue(exec, index);
+    return propertyHelper(exec, value, index, resolveMode);
+}
+inline QScriptValue::PropertyFlags QScriptEnginePrivate::propertyFlags(JSC::ExecState *exec, JSC::JSValue value,
+                                                                       const JSC::UString &name,
+                                                                       const QScriptValue::ResolveFlags &mode)
+{
+    return propertyFlags(exec, value, JSC::Identifier(exec, name), mode);
+}
+inline void QScriptEnginePrivate::setProperty(JSC::ExecState *exec, JSC::JSValue objectValue, const JSC::UString &name,
+                                              JSC::JSValue value, const QScriptValue::PropertyFlags &flags)
+{
+    setProperty(exec, objectValue, JSC::Identifier(exec, name), value, flags);
+}
+inline JSC::JSValue QScriptValuePrivate::property(const JSC::Identifier &id, const QScriptValue::ResolveFlags &resolveMode) const
+{
+    return QScriptEnginePrivate::property(engine->currentFrame, jscValue, id, resolveMode);
+}
+inline JSC::JSValue QScriptValuePrivate::property(quint32 index, const QScriptValue::ResolveFlags &resolveMode) const
+{
+    return QScriptEnginePrivate::property(engine->currentFrame, jscValue, index, resolveMode);
+}
+inline JSC::JSValue QScriptValuePrivate::property(const JSC::UString &name, const QScriptValue::ResolveFlags &resolveMode) const
+{
+    JSC::ExecState *exec = engine->currentFrame;
+    return QScriptEnginePrivate::property(exec, jscValue, JSC::Identifier(exec, name), resolveMode);
+}
+inline QScriptValue::PropertyFlags QScriptValuePrivate::propertyFlags(
+        const JSC::Identifier &id, const QScriptValue::ResolveFlags &mode) const
+{
+    return QScriptEnginePrivate::propertyFlags(engine->currentFrame, jscValue, id, mode);
+}
+inline void QScriptValuePrivate::setProperty(const JSC::Identifier &id, const JSC::JSValue &value,
+                                             const QScriptValue::PropertyFlags &flags)
+{
+    QScriptEnginePrivate::setProperty(engine->currentFrame, jscValue, id, value, flags);
+}
+inline void QScriptValuePrivate::setProperty(quint32 index, const JSC::JSValue &value,
+                                             const QScriptValue::PropertyFlags &flags)
+{
+    QScriptEnginePrivate::setProperty(engine->currentFrame, jscValue, index, value, flags);
+}
+inline void QScriptValuePrivate::setProperty(const JSC::UString &name, const JSC::JSValue &value,
+                                             const QScriptValue::PropertyFlags &flags)
+{
+    JSC::ExecState *exec = engine->currentFrame;
+    QScriptEnginePrivate::setProperty(exec, jscValue, JSC::Identifier(exec, name), value, flags);
+}
 …
+}
 inline void QScriptValuePrivate::saveException(JSC::ExecState *exec, JSC::JSValue *val)
+inline void QScriptEnginePrivate::saveException(JSC::ExecState *exec, JSC::JSValue *val)
+{
     if (exec) {
 …
+}
 inline void QScriptValuePrivate::restoreException(JSC::ExecState *exec, JSC::JSValue val)
+inline void QScriptEnginePrivate::restoreException(JSC::ExecState *exec, JSC::JSValue val)
+{
     if (exec && val)
 …
+}
+inline bool QScriptEnginePrivate::hasValidCodeBlockRegister(JSC::ExecState *frame)
+{
+#if ENABLE(JIT)
+    // Frames created by the VM don't have their CodeBlock register
+    // initialized. We can detect such frames by checking if the
+    // callee is a host JSFunction.
+    JSC::JSObject *callee = frame->callee();
+    return !(callee && callee->inherits(&JSC::JSFunction::info)
+             && JSC::asFunction(callee)->isHostFunction());
+#else
+    Q_UNUSED(frame);
+    return true;
+#endif
+}
 inline JSC::ExecState *QScriptEnginePrivate::globalExec() const
+{
 …
+}
+inline JSC::JSValue QScriptEnginePrivate::newArray(JSC::ExecState *exec, uint length)
+{
+    return JSC::constructEmptyArray(exec, length);
+}
+inline JSC::JSValue QScriptEnginePrivate::newDate(JSC::ExecState *exec, qsreal value)
+{
+    JSC::JSValue val = JSC::jsNumber(exec, value);
+    JSC::ArgList args(&val, 1);
+    return JSC::constructDate(exec, args);
+}
+inline JSC::JSValue QScriptEnginePrivate::newDate(JSC::ExecState *exec, const QDateTime &value)
+{
+    return newDate(exec, QScript::DateTimeToMs(exec, value));
+}
+inline JSC::JSValue QScriptEnginePrivate::newObject()
+{
+    return new (currentFrame)QScriptObject(scriptObjectStructure);
+}
+inline bool QScriptEnginePrivate::isObject(JSC::JSValue value)
+{
+    return value && value.isObject();
+}
+inline bool QScriptEnginePrivate::isArray(JSC::JSValue value)
+{
+    return isObject(value) && value.inherits(&JSC::JSArray::info);
+}
+inline bool QScriptEnginePrivate::isDate(JSC::JSValue value)
+{
+    return isObject(value) && value.inherits(&JSC::DateInstance::info);
+}
+inline bool QScriptEnginePrivate::isError(JSC::JSValue value)
+{
+    return isObject(value) && value.inherits(&JSC::ErrorInstance::info);
+}
+inline bool QScriptEnginePrivate::isRegExp(JSC::JSValue value)
+{
+    return isObject(value) && value.inherits(&JSC::RegExpObject::info);
+}
+inline bool QScriptEnginePrivate::isVariant(JSC::JSValue value)
+{
+    if (!isObject(value) || !value.inherits(&QScriptObject::info))
+        return false;
+    QScriptObject *object = static_cast<QScriptObject*>(JSC::asObject(value));
+    QScriptObjectDelegate *delegate = object->delegate();
+    return (delegate && (delegate->type() == QScriptObjectDelegate::Variant));
+}
+inline bool QScriptEnginePrivate::isQObject(JSC::JSValue value)
+{
+#ifndef QT_NO_QOBJECT
+    if (!isObject(value) || !value.inherits(&QScriptObject::info))
+        return false;
+    QScriptObject *object = static_cast<QScriptObject*>(JSC::asObject(value));
+    QScriptObjectDelegate *delegate = object->delegate();
+    return (delegate && (delegate->type() == QScriptObjectDelegate::QtObject ||
+                         (delegate->type() == QScriptObjectDelegate::DeclarativeClassObject &&
+                          static_cast<QScript::DeclarativeObjectDelegate*>(delegate)->scriptClass()->isQObject())));
+#else
+    return false;
+#endif
+}
+inline bool QScriptEnginePrivate::isQMetaObject(JSC::JSValue value)
+{
+#ifndef QT_NO_QOBJECT
+    return isObject(value) && JSC::asObject(value)->inherits(&QScript::QMetaObjectWrapperObject::info);
+#else
+    return false;
+#endif
+}
+inline bool QScriptEnginePrivate::toBool(JSC::ExecState *exec, JSC::JSValue value)
+{
+    JSC::JSValue savedException;
+    saveException(exec, &savedException);
+    bool result = value.toBoolean(exec);
+    restoreException(exec, savedException);
+    return result;
+}
+inline qsreal QScriptEnginePrivate::toInteger(JSC::ExecState *exec, JSC::JSValue value)
+{
+    JSC::JSValue savedException;
+    saveException(exec, &savedException);
+    qsreal result = value.toInteger(exec);
+    restoreException(exec, savedException);
+    return result;
+}
+inline qsreal QScriptEnginePrivate::toNumber(JSC::ExecState *exec, JSC::JSValue value)
+{
+    JSC::JSValue savedException;
+    saveException(exec, &savedException);
+    qsreal result = value.toNumber(exec);
+    restoreException(exec, savedException);
+    return result;
+}
+inline qint32 QScriptEnginePrivate::toInt32(JSC::ExecState *exec, JSC::JSValue value)
+{
+    JSC::JSValue savedException;
+    saveException(exec, &savedException);
+    qint32 result = value.toInt32(exec);
+    restoreException(exec, savedException);
+    return result;
+}
+inline quint32 QScriptEnginePrivate::toUInt32(JSC::ExecState *exec, JSC::JSValue value)
+{
+    JSC::JSValue savedException;
+    saveException(exec, &savedException);
+    quint32 result = value.toUInt32(exec);
+    restoreException(exec, savedException);
+    return result;
+}
+inline quint16 QScriptEnginePrivate::toUInt16(JSC::ExecState *exec, JSC::JSValue value)
+{
+    // ### no equivalent function in JSC
+    return QScript::ToUInt16(toNumber(exec, value));
+}
+inline JSC::UString QScriptEnginePrivate::toString(JSC::ExecState *exec, JSC::JSValue value)
+{
+    JSC::JSValue savedException;
+    saveException(exec, &savedException);
+    JSC::UString str = value.toString(exec);
+    if (exec && exec->hadException() && !str.size()) {
+        JSC::JSValue savedException2;
+        saveException(exec, &savedException2);
+        str = savedException2.toString(exec);
+        restoreException(exec, savedException2);
+    }
+    if (savedException)
+        restoreException(exec, savedException);
+    return str;
+}
+inline QDateTime QScriptEnginePrivate::toDateTime(JSC::ExecState *exec, JSC::JSValue value)
+{
+    if (!isDate(value))
+        return QDateTime();
+    qsreal t = static_cast<JSC::DateInstance*>(JSC::asObject(value))->internalNumber();
+    return QScript::MsToDateTime(exec, t);
+}
+inline QObject *QScriptEnginePrivate::toQObject(JSC::ExecState *exec, JSC::JSValue value)
+{
+#ifndef QT_NO_QOBJECT
+    if (isObject(value) && value.inherits(&QScriptObject::info)) {
+        QScriptObject *object = static_cast<QScriptObject*>(JSC::asObject(value));
+        QScriptObjectDelegate *delegate = object->delegate();
+        if (!delegate)
+            return 0;
+        if (delegate->type() == QScriptObjectDelegate::QtObject)
+            return static_cast<QScript::QObjectDelegate*>(delegate)->value();
+        if (delegate->type() == QScriptObjectDelegate::DeclarativeClassObject)
+            return static_cast<QScript::DeclarativeObjectDelegate*>(delegate)->scriptClass()->toQObject(declarativeObject(value));
+        if (delegate->type() == QScriptObjectDelegate::Variant) {
+            QVariant var = variantValue(value);
+            int type = var.userType();
+            if ((type == QMetaType::QObjectStar) || (type == QMetaType::QWidgetStar))
+                return *reinterpret_cast<QObject* const *>(var.constData());
+        }
+    }
+#endif
+    return 0;
+}
+inline const QMetaObject *QScriptEnginePrivate::toQMetaObject(JSC::ExecState*, JSC::JSValue value)
+{
+#ifndef QT_NO_QOBJECT
+    if (isQMetaObject(value))
+        return static_cast<QScript::QMetaObjectWrapperObject*>(JSC::asObject(value))->value();
+#endif
+    return 0;
+}
+inline QVariant &QScriptEnginePrivate::variantValue(JSC::JSValue value)
+{
+    Q_ASSERT(value.inherits(&QScriptObject::info));
+    QScriptObjectDelegate *delegate = static_cast<QScriptObject*>(JSC::asObject(value))->delegate();
+    Q_ASSERT(delegate && (delegate->type() == QScriptObjectDelegate::Variant));
+    return static_cast<QScript::QVariantDelegate*>(delegate)->value();
+}
+inline void QScriptEnginePrivate::setVariantValue(JSC::JSValue objectValue, const QVariant &value)
+{
+    Q_ASSERT(objectValue.inherits(&QScriptObject::info));
+    QScriptObjectDelegate *delegate = static_cast<QScriptObject*>(JSC::asObject(objectValue))->delegate();
+    Q_ASSERT(delegate && (delegate->type() == QScriptObjectDelegate::Variant));
+    static_cast<QScript::QVariantDelegate*>(delegate)->setValue(value);
+}
+inline QScriptDeclarativeClass *QScriptEnginePrivate::declarativeClass(JSC::JSValue v)
+{
+    if (!QScriptEnginePrivate::isObject(v) || !v.inherits(&QScriptObject::info))
+        return 0;
+    QScriptObject *scriptObject = static_cast<QScriptObject*>(JSC::asObject(v));
+    QScriptObjectDelegate *delegate = scriptObject->delegate();
+    if (!delegate || (delegate->type() != QScriptObjectDelegate::DeclarativeClassObject))
+        return 0;
+    return static_cast<QScript::DeclarativeObjectDelegate*>(delegate)->scriptClass();
+}
+inline QScriptDeclarativeClass::Object *QScriptEnginePrivate::declarativeObject(JSC::JSValue v)
+{
+    if (!QScriptEnginePrivate::isObject(v) || !v.inherits(&QScriptObject::info))
+        return 0;
+    QScriptObject *scriptObject = static_cast<QScriptObject*>(JSC::asObject(v));
+    QScriptObjectDelegate *delegate = scriptObject->delegate();
+    if (!delegate || (delegate->type() != QScriptObjectDelegate::DeclarativeClassObject))
+        return 0;
+    return static_cast<QScript::DeclarativeObjectDelegate*>(delegate)->object();
+}
 QT_END_NAMESPACE

trunk/src/script/api/qscriptengineagent.cpp

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
         engine->originalGlobalObject()->setDebugger(0);
     JSC::Debugger::attach(engine->originalGlobalObject());
+    if (!QScriptEnginePrivate::get(engine)->isEvaluating())
+        JSC::Debugger::recompileAllJSFunctions(engine->globalData);
+}
 …
+{
     JSC::CallFrame *oldFrame = engine->currentFrame;
+    int oldAgentLineNumber = engine->agentLineNumber;
     engine->currentFrame = frame.callFrame();
     QScriptValue value(engine->scriptValueFromJSCValue(frame.exception()));
+    engine->agentLineNumber = value.property(QLatin1String("lineNumber")).toInt32();
     q_ptr->exceptionThrow(sourceID, value, hasHandler);
+    engine->agentLineNumber = oldAgentLineNumber;
     engine->currentFrame = oldFrame;
     engine->setCurrentException(value);
 …
+}
 void QScriptEngineAgentPrivate::atStatement(const JSC::DebuggerCallFrame& frame, intptr_t sourceID, int lineno, int column)
+void QScriptEngineAgentPrivate::atStatement(const JSC::DebuggerCallFrame& frame, intptr_t sourceID, int lineno/*, int column*/)
+{
     QScript::UStringSourceProviderWithFeedback *source = engine->loadedScripts.value(sourceID);
 …
         return;
+    }
+    column = source->columnNumberFromOffset(column);
+//    column = source->columnNumberFromOffset(column);
+    int column = 1;
     JSC::CallFrame *oldFrame = engine->currentFrame;
     int oldAgentLineNumber = engine->agentLineNumber;
 …
 void QScriptEngineAgentPrivate::didReachBreakpoint(const JSC::DebuggerCallFrame& frame,
                                                    intptr_t sourceID, int lineno, int column)
+                                                   intptr_t sourceID, int lineno/*, int column*/)
+{
     if (q_ptr->supportsExtension(QScriptEngineAgent::DebuggerInvocationRequest)) {
 …
             return;
+        }
+        column = source->columnNumberFromOffset(column);
+//        column = source->columnNumberFromOffset(column);
+        int column = 1;
         JSC::CallFrame *oldFrame = engine->currentFrame;
         int oldAgentLineNumber = engine->agentLineNumber;
 …
   This function is called when the engine is about to execute a new
   statement in the script identified by \a scriptId.  The statement
+  begins on the line and column specified by \a lineNumber and \a
+  columnNumber.  This event is not generated for native Qt Script
+  functions.
+  begins on the line and column specified by \a lineNumber
+  This event is not generated for native Qt Script functions.
   Reimplement this function to handle this event. For example, a
 …
   The default implementation does nothing.
+  \note \a columnNumber is undefined
   \sa scriptLoad(), functionEntry()

trunk/src/script/api/qscriptengineagent.h

r651	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/script/api/qscriptengineagent_p.h

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
     //exceptions
     virtual void exception(const JSC::DebuggerCallFrame& frame, intptr_t sourceID, int lineno)
+    virtual void exception(const JSC::DebuggerCallFrame& frame, intptr_t sourceID, int lineno, bool hasHandler)
+    {
         Q_UNUSED(frame);
         Q_UNUSED(sourceID);
         Q_UNUSED(lineno);
+        Q_UNUSED(hasHandler);
     };
     virtual void exceptionThrow(const JSC::DebuggerCallFrame& frame, intptr_t sourceID, bool hasHandler);
 …
     //statements
     virtual void atStatement(const JSC::DebuggerCallFrame&, intptr_t sourceID, int lineno, int column);
+    virtual void atStatement(const JSC::DebuggerCallFrame&, intptr_t sourceID, int lineno/*, int column*/);
     virtual void callEvent(const JSC::DebuggerCallFrame&, intptr_t sourceID, int lineno)
+    {
 …
     virtual void functionExit(const JSC::JSValue& returnValue, intptr_t sourceID);
     //others
     virtual void didReachBreakpoint(const JSC::DebuggerCallFrame& frame, intptr_t sourceID, int lineno, int column);
+    virtual void didReachBreakpoint(const JSC::DebuggerCallFrame& frame, intptr_t sourceID, int lineno/*, int column*/);
     virtual void evaluateStart(intptr_t sourceID)

trunk/src/script/api/qscriptextensioninterface.h

r651	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/script/api/qscriptextensionplugin.cpp

r651	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/script/api/qscriptextensionplugin.h

r651	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/script/api/qscriptprogram.cpp

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
 /*!
+  \internal
+  \since 4.6
+  \since 4.7
   \class QScriptProgram
 …
 QScriptProgramPrivate::~QScriptProgramPrivate()
+{
+    delete _executable;
+    if (engine) {
+        QScript::APIShim shim(engine);
+        _executable.clear();
+        engine->unregisterScriptProgram(this);
+    }
+}
 …
     if (_executable) {
         if (eng == engine)
+            return _executable;
+        delete _executable;
+            return _executable.get();
+        // "Migrating" to another engine; clean up old state
+        QScript::APIShim shim(engine);
+        _executable.clear();
+        engine->unregisterScriptProgram(this);
+    }
     WTF::PassRefPtr<QScript::UStringSourceProviderWithFeedback> provider
 …
     sourceId = provider->asID();
     JSC::SourceCode source(provider, firstLineNumber); //after construction of SourceCode provider variable will be null.
     _executable = new JSC::EvalExecutable(exec, source);
+    _executable = JSC::EvalExecutable::create(exec, source);
     engine = eng;
+    engine->registerScriptProgram(this);
     isCompiled = false;
+    return _executable;
+    return _executable.get();
+}
+void QScriptProgramPrivate::detachFromEngine()
+{
+    _executable.clear();
+    sourceId = -1;
+    isCompiled = false;
+    engine = 0;
+}
 …
 QScriptProgram::~QScriptProgram()
+{
-    Q_D(QScriptProgram);
-    //    if (d->engine && (d->ref == 1))
-    //      d->engine->unregisterScriptProgram(d);
+}
 …
 QScriptProgram &QScriptProgram::operator=(const QScriptProgram &other)
+{
-  //    if (d_func() && d_func()->engine && (d_func()->ref == 1))
-      //        d_func()->engine->unregisterScriptProgram(d_func());
-  //    }
     d_ptr = other.d_ptr;
     return *this;

trunk/src/script/api/qscriptprogram.h

r651	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/script/api/qscriptprogram_p.h

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
 #include <QtCore/qobjectdefs.h>
+#include "RefPtr.h"
 namespace JSC
+{
 …
     JSC::EvalExecutable *executable(JSC::ExecState *exec,
                                     QScriptEnginePrivate *engine);
+    void detachFromEngine();
     QBasicAtomicInt ref;
 …
     QScriptEnginePrivate *engine;
     JSC::EvalExecutable *_executable;
+    WTF::RefPtr<JSC::EvalExecutable> _executable;
     intptr_t sourceId;
     bool isCompiled;

trunk/src/script/api/qscriptstring.cpp

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
             break;
         case QScriptStringPrivate::HeapAllocated:
+            if (d->engine && (d->ref == 1))
+            if (d->engine && (d->ref == 1)) {
+                // Make sure the identifier is removed from the correct engine.
+                QScript::APIShim shim(d->engine);
+                d->identifier = JSC::Identifier();
                 d->engine->unregisterScriptString(d);
+            }
             break;
+        }

trunk/src/script/api/qscriptstring.h

r651	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/script/api/qscriptstring_p.h

r651	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/script/api/qscriptvalue.cpp

-              r769
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
 #include "qscriptstring_p.h"
-#include "JSArray.h"
 #include "JSGlobalObject.h"
 #include "JSImmediate.h"
 …
 #include "JSValue.h"
 #include "JSFunction.h"
-#include "DateInstance.h"
-#include "ErrorInstance.h"
-#include "RegExpObject.h"
 #include "Identifier.h"
 #include "Operations.h"
 #include "Arguments.h"
-#include <QtCore/qdatetime.h>
-#include <QtCore/qregexp.h>
 #include <QtCore/qvariant.h>
 #include <QtCore/qvarlengtharray.h>
 #include <QtCore/qnumeric.h>
-#include "utils/qscriptdate_p.h"
-#include "bridge/qscriptobject_p.h"
-#include "bridge/qscriptclassobject_p.h"
-#include "bridge/qscriptvariant_p.h"
-#include "bridge/qscriptqobject_p.h"
-#include "bridge/qscriptdeclarativeclass_p.h"
-#include "bridge/qscriptdeclarativeobject_p.h"
 /*!
 …
 */
-// ### move
-#include <QtCore/qnumeric.h>
-#include <math.h>
 QT_BEGIN_NAMESPACE
-namespace QScript
+{
-static const qsreal D32 = 4294967296.0;
-qint32 ToInt32(qsreal n)
+{
-    if (qIsNaN(n) || qIsInf(n) || (n == 0))
-        return 0;
-    qsreal sign = (n < 0) ? -1.0 : 1.0;
-    qsreal abs_n = fabs(n);
-    n = ::fmod(sign * ::floor(abs_n), D32);
-    const double D31 = D32 / 2.0;
-    if (sign == -1 && n < -D31)
-        n += D32;
-    else if (sign != -1 && n >= D31)
-        n -= D32;
-    return qint32 (n);
+}
-quint32 ToUint32(qsreal n)
+{
-    if (qIsNaN(n) || qIsInf(n) || (n == 0))
-        return 0;
-    qsreal sign = (n < 0) ? -1.0 : 1.0;
-    qsreal abs_n = fabs(n);
-    n = ::fmod(sign * ::floor(abs_n), D32);
-    if (n < 0)
-        n += D32;
-    return quint32 (n);
+}
-quint16 ToUint16(qsreal n)
+{
-    static const qsreal D16 = 65536.0;
-    if (qIsNaN(n) || qIsInf(n) || (n == 0))
-        return 0;
-    qsreal sign = (n < 0) ? -1.0 : 1.0;
-    qsreal abs_n = fabs(n);
-    n = ::fmod(sign * ::floor(abs_n), D16);
-    if (n < 0)
-        n += D16;
-    return quint16 (n);
+}
-qsreal ToInteger(qsreal n)
+{
-    if (qIsNaN(n))
-        return 0;
-    if (n == 0 || qIsInf(n))
-        return n;
-    int sign = n < 0 ? -1 : 1;
-    return sign * ::floor(::fabs(n));
+}
-} // namespace QScript
-QScriptValue QScriptValuePrivate::propertyHelper(const JSC::Identifier &id, int resolveMode) const
+{
-    JSC::JSValue result;
-    if (!(resolveMode & QScriptValue::ResolvePrototype)) {
-        // Look in the object's own properties
-        JSC::ExecState *exec = engine->currentFrame;
-        JSC::JSObject *object = JSC::asObject(jscValue);
-        JSC::PropertySlot slot(object);
-        if (object->getOwnPropertySlot(exec, id, slot))
-            result = slot.getValue(exec, id);
+    }
-    if (!result && (resolveMode & QScriptValue::ResolveScope)) {
-        // ### check if it's a function object and look in the scope chain
-        QScriptValue scope = property(QString::fromLatin1("__qt_scope__"), QScriptValue::ResolveLocal);
-        if (scope.isObject())
-            result = engine->scriptValueToJSCValue(QScriptValuePrivate::get(scope)->property(id, resolveMode));
+    }
-    return engine->scriptValueFromJSCValue(result);
+}
-QScriptValue QScriptValuePrivate::propertyHelper(quint32 index, int resolveMode) const
+{
-    JSC::JSValue result;
-    if (!(resolveMode & QScriptValue::ResolvePrototype)) {
-        // Look in the object's own properties
-        JSC::ExecState *exec = engine->currentFrame;
-        JSC::JSObject *object = JSC::asObject(jscValue);
-        JSC::PropertySlot slot(object);
-        if (object->getOwnPropertySlot(exec, index, slot))
-            result = slot.getValue(exec, index);
+    }
-    return engine->scriptValueFromJSCValue(result);
+}
-void QScriptValuePrivate::setProperty(const JSC::Identifier &id, const QScriptValue &value,
-                                      const QScriptValue::PropertyFlags &flags)
+{
-    QScriptEnginePrivate *valueEngine = QScriptValuePrivate::getEngine(value);
-    if (valueEngine && (valueEngine != engine)) {
-        qWarning("QScriptValue::setProperty(%s) failed: "
-                 "cannot set value created in a different engine",
-                 qPrintable(QString(id.ustring())));
-        return;
+    }
-    JSC::ExecState *exec = engine->currentFrame;
-    JSC::JSValue jsValue = engine->scriptValueToJSCValue(value);
-    JSC::JSObject *thisObject = JSC::asObject(jscValue);
-    JSC::JSValue setter = thisObject->lookupSetter(exec, id);
-    JSC::JSValue getter = thisObject->lookupGetter(exec, id);
-    if ((flags & QScriptValue::PropertyGetter) || (flags & QScriptValue::PropertySetter)) {
-        if (!jsValue) {
-            // deleting getter/setter
-            if ((flags & QScriptValue::PropertyGetter) && (flags & QScriptValue::PropertySetter)) {
-                // deleting both: just delete the property
-                thisObject->deleteProperty(exec, id, /*checkDontDelete=*/false);
-            } else if (flags & QScriptValue::PropertyGetter) {
-                // preserve setter, if there is one
-                thisObject->deleteProperty(exec, id, /*checkDontDelete=*/false);
-                if (setter && setter.isObject())
-                    thisObject->defineSetter(exec, id, JSC::asObject(setter));
-            } else { // flags & QScriptValue::PropertySetter
-                // preserve getter, if there is one
-                thisObject->deleteProperty(exec, id, /*checkDontDelete=*/false);
-                if (getter && getter.isObject())
-                    thisObject->defineGetter(exec, id, JSC::asObject(getter));
+            }
-        } else {
-            if (jsValue.isObject()) { // ### should check if it has callData()
-                // defining getter/setter
-                if (id == exec->propertyNames().underscoreProto) {
-                    qWarning("QScriptValue::setProperty() failed: "
-                             "cannot set getter or setter of native property `__proto__'");
-                } else {
-                    if (flags & QScriptValue::PropertyGetter)
-                        thisObject->defineGetter(exec, id, JSC::asObject(jsValue));
-                    if (flags & QScriptValue::PropertySetter)
-                        thisObject->defineSetter(exec, id, JSC::asObject(jsValue));
+                }
-            } else {
-                qWarning("QScriptValue::setProperty(): getter/setter must be a function");
+            }
+        }
-    } else {
-        // setting the value
-        if (getter && getter.isObject() && !(setter && setter.isObject())) {
-            qWarning("QScriptValue::setProperty() failed: "
-                     "property '%s' has a getter but no setter",
-                     qPrintable(QString(id.ustring())));
-            return;
+        }
-        if (!jsValue) {
-            // ### check if it's a getter/setter property
-            thisObject->deleteProperty(exec, id, /*checkDontDelete=*/false);
-        } else if (flags != QScriptValue::KeepExistingFlags) {
-            if (thisObject->hasOwnProperty(exec, id))
-                thisObject->deleteProperty(exec, id, /*checkDontDelete=*/false); // ### hmmm - can't we just update the attributes?
-            unsigned attribs = 0;
-            if (flags & QScriptValue::ReadOnly)
-                attribs |= JSC::ReadOnly;
-            if (flags & QScriptValue::SkipInEnumeration)
-                attribs |= JSC::DontEnum;
-            if (flags & QScriptValue::Undeletable)
-                attribs |= JSC::DontDelete;
-            attribs |= flags & QScriptValue::UserRange;
-            thisObject->putWithAttributes(exec, id, jsValue, attribs);
-        } else {
-            JSC::PutPropertySlot slot;
-            thisObject->put(exec, id, jsValue, slot);
+        }
+    }
+}
-QScriptValue::PropertyFlags QScriptValuePrivate::propertyFlags(const JSC::Identifier &id,
-                                                               const QScriptValue::ResolveFlags &mode) const
+{
-    JSC::ExecState *exec = engine->currentFrame;
-    JSC::JSObject *object = JSC::asObject(jscValue);
-    unsigned attribs = 0;
-    JSC::PropertyDescriptor descriptor;
-    if (object->getOwnPropertyDescriptor(exec, id, descriptor))
-        attribs = descriptor.attributes();
-    else if (!object->getPropertyAttributes(exec, id, attribs)) {
-        if ((mode & QScriptValue::ResolvePrototype) && object->prototype() && object->prototype().isObject()) {
-            QScriptValue proto = engine->scriptValueFromJSCValue(object->prototype());
-            return QScriptValuePrivate::get(proto)->propertyFlags(id, mode);
+        }
-        return 0;
+    }
-    QScriptValue::PropertyFlags result = 0;
-    if (attribs & JSC::ReadOnly)
-        result |= QScriptValue::ReadOnly;
-    if (attribs & JSC::DontEnum)
-        result |= QScriptValue::SkipInEnumeration;
-    if (attribs & JSC::DontDelete)
-        result |= QScriptValue::Undeletable;
-    //We cannot rely on attribs JSC::Setter/Getter because they are not necesserly set by JSC (bug?)
-    if (attribs & JSC::Getter || !object->lookupGetter(exec, id).isUndefinedOrNull())
-        result |= QScriptValue::PropertyGetter;
-    if (attribs & JSC::Setter || !object->lookupSetter(exec, id).isUndefinedOrNull())
-        result |= QScriptValue::PropertySetter;
-    if (attribs & QScript::QObjectMemberAttribute)
-        result |= QScriptValue::QObjectMember;
-    result |= QScriptValue::PropertyFlag(attribs & QScriptValue::UserRange);
-    return result;
+}
-QVariant &QScriptValuePrivate::variantValue() const
+{
-    Q_ASSERT(jscValue.inherits(&QScriptObject::info));
-    QScriptObjectDelegate *delegate = static_cast<QScriptObject*>(JSC::asObject(jscValue))->delegate();
-    Q_ASSERT(delegate && (delegate->type() == QScriptObjectDelegate::Variant));
-    return static_cast<QScript::QVariantDelegate*>(delegate)->value();
+}
-void QScriptValuePrivate::setVariantValue(const QVariant &value)
+{
-    Q_ASSERT(jscValue.inherits(&QScriptObject::info));
-    QScriptObjectDelegate *delegate = static_cast<QScriptObject*>(JSC::asObject(jscValue))->delegate();
-    Q_ASSERT(delegate && (delegate->type() == QScriptObjectDelegate::Variant));
-    static_cast<QScript::QVariantDelegate*>(delegate)->setValue(value);
+}
 void QScriptValuePrivate::detachFromEngine()
 …
+{
     Q_D(const QScriptValue);
     if (!d || !d->isObject())
+    if (!d || !d->isJSC())
         return false;
     return d->jscValue.inherits(&JSC::ErrorInstance::info);
+    return QScriptEnginePrivate::isError(d->jscValue);
+}
 …
+{
     Q_D(const QScriptValue);
     if (!d || !d->isObject())
+    if (!d || !d->isJSC())
         return false;
     return d->jscValue.inherits(&JSC::JSArray::info);
+    return QScriptEnginePrivate::isArray(d->jscValue);
+}
 …
+{
     Q_D(const QScriptValue);
     if (!d || !d->isObject())
+    if (!d || !d->isJSC())
         return false;
     return d->jscValue.inherits(&JSC::DateInstance::info);
+    return QScriptEnginePrivate::isDate(d->jscValue);
+}
 …
+{
     Q_D(const QScriptValue);
     if (!d || !d->isObject())
+    if (!d || !d->isJSC())
         return false;
     return d->jscValue.inherits(&JSC::RegExpObject::info);
+    return QScriptEnginePrivate::isRegExp(d->jscValue);
+}
 …
     if (!d || !d->isObject())
         return QScriptValue();
+    QScript::APIShim shim(d->engine);
     // ### make hidden property
+    return d->property(QLatin1String("__qt_scope__"), QScriptValue::ResolveLocal);
+    JSC::JSValue result = d->property("__qt_scope__", QScriptValue::ResolveLocal);
+    return d->engine->scriptValueFromJSCValue(result);
+}
 …
+}
 QScriptValue ToPrimitive(const QScriptValue &object, JSC::PreferredPrimitiveType hint = JSC::NoPreference)
+static QScriptValue ToPrimitive(const QScriptValue &object, JSC::PreferredPrimitiveType hint = JSC::NoPreference)
+{
     Q_ASSERT(object.isObject());
     QScriptValuePrivate *pp = QScriptValuePrivate::get(object);
     Q_ASSERT(pp->engine != 0);
+    QScript::APIShim shim(pp->engine);
     JSC::ExecState *exec = pp->engine->currentFrame;
     JSC::JSValue savedException;
     QScriptValuePrivate::saveException(exec, &savedException);
+    QScriptEnginePrivate::saveException(exec, &savedException);
     JSC::JSValue result = JSC::asObject(pp->jscValue)->toPrimitive(exec, hint);
     QScriptValuePrivate::restoreException(exec, savedException);
+    QScriptEnginePrivate::restoreException(exec, savedException);
     return pp->engine->scriptValueFromJSCValue(result);
+}
 …
             eng_p = other.d_ptr->engine;
         if (eng_p) {
+            QScript::APIShim shim(eng_p);
             JSC::ExecState *exec = eng_p->currentFrame;
             JSC::JSValue savedException;
             QScriptValuePrivate::saveException(exec, &savedException);
+            QScriptEnginePrivate::saveException(exec, &savedException);
             bool result = JSC::JSValue::equal(exec, d->jscValue, other.d_ptr->jscValue);
             QScriptValuePrivate::restoreException(exec, savedException);
+            QScriptEnginePrivate::restoreException(exec, savedException);
             return result;
+        }
 …
             QScriptEnginePrivate *eng_p = d->engine ? d->engine : other.d_ptr->engine;
             if (eng_p)
                 return JSC::JSValue::strictEqual(d->jscValue, eng_p->scriptValueToJSCValue(other));
+                return JSC::JSValue::strictEqual(eng_p->currentFrame, d->jscValue, eng_p->scriptValueToJSCValue(other));
         } else if (other.d_ptr->type == QScriptValuePrivate::JavaScriptCore) {
             QScriptEnginePrivate *eng_p = other.d_ptr->engine ? other.d_ptr->engine : d->engine;
             if (eng_p)
                 return JSC::JSValue::strictEqual(eng_p->scriptValueToJSCValue(*this), other.d_ptr->jscValue);
+                return JSC::JSValue::strictEqual(eng_p->currentFrame, eng_p->scriptValueToJSCValue(*this), other.d_ptr->jscValue);
+        }
 …
+    }
     switch (d->type) {
+    case QScriptValuePrivate::JavaScriptCore:
+        return JSC::JSValue::strictEqual(d->jscValue, other.d_ptr->jscValue);
+    case QScriptValuePrivate::JavaScriptCore: {
+        QScriptEnginePrivate *eng_p = d->engine ? d->engine : other.d_ptr->engine;
+        JSC::ExecState *exec = eng_p ? eng_p->currentFrame : 0;
+        return JSC::JSValue::strictEqual(exec, d->jscValue, other.d_ptr->jscValue);
+    }
     case QScriptValuePrivate::Number:
         return (d->numberValue == other.d_ptr->numberValue);
 …
     switch (d->type) {
     case QScriptValuePrivate::JavaScriptCore: {
+        JSC::ExecState *exec = d->engine ? d->engine->currentFrame : 0;
+        JSC::JSValue savedException;
+        QScriptValuePrivate::saveException(exec, &savedException);
+        JSC::UString str = d->jscValue.toString(exec);
+        if (exec && exec->hadException() && !str.size()) {
+            JSC::JSValue savedException2;
+            QScriptValuePrivate::saveException(exec, &savedException2);
+            str = savedException2.toString(exec);
+            QScriptValuePrivate::restoreException(exec, savedException2);
+        }
+        if (savedException)
+            QScriptValuePrivate::restoreException(exec, savedException);
+        return str;
+    }
+        if (d->engine) {
+            QScript::APIShim shim(d->engine);
+            return QScriptEnginePrivate::toString(d->engine->currentFrame, d->jscValue);
+        } else {
+            return QScriptEnginePrivate::toString(0, d->jscValue);
+        }    }
     case QScriptValuePrivate::Number:
         return JSC::UString::from(d->numberValue);
+        return QScript::ToString(d->numberValue);
     case QScriptValuePrivate::String:
         return d->stringValue;
 …
     switch (d->type) {
     case QScriptValuePrivate::JavaScriptCore: {
         JSC::ExecState *exec = d->engine ? d->engine->currentFrame : 0;
         JSC::JSValue savedException;
         QScriptValuePrivate::saveException(exec, &savedException);
         qsreal result = d->jscValue.toNumber(exec);
         QScriptValuePrivate::restoreException(exec, savedException);
         return result;
+        if (d->engine) {
+            QScript::APIShim shim(d->engine);
+            return QScriptEnginePrivate::toNumber(d->engine->currentFrame, d->jscValue);
+        } else {
+            return QScriptEnginePrivate::toNumber(0, d->jscValue);
+        }
+    }
     case QScriptValuePrivate::Number:
         return d->numberValue;
     case QScriptValuePrivate::String:
         return ((JSC::UString)d->stringValue).toDouble();
+        return QScript::ToNumber(d->stringValue);
+    }
     return 0;
 …
     switch (d->type) {
     case QScriptValuePrivate::JavaScriptCore: {
         JSC::ExecState *exec = d->engine ? d->engine->currentFrame : 0;
         JSC::JSValue savedException;
         QScriptValuePrivate::saveException(exec, &savedException);
         bool result = d->jscValue.toBoolean(exec);
         QScriptValuePrivate::restoreException(exec, savedException);
         return result;
+        if (d->engine) {
+            QScript::APIShim shim(d->engine);
+            return QScriptEnginePrivate::toBool(d->engine->currentFrame, d->jscValue);
+        } else {
+            return QScriptEnginePrivate::toBool(0, d->jscValue);
+        }
+    }
     case QScriptValuePrivate::Number:
         return (d->numberValue != 0) && !qIsNaN(d->numberValue);
+        return QScript::ToBool(d->numberValue);
     case QScriptValuePrivate::String:
         return (!d->stringValue.isEmpty());
+        return QScript::ToBool(d->stringValue);
+    }
     return false;
 …
     switch (d->type) {
     case QScriptValuePrivate::JavaScriptCore: {
         JSC::ExecState *exec = d->engine ? d->engine->currentFrame : 0;
         JSC::JSValue savedException;
         QScriptValuePrivate::saveException(exec, &savedException);
         bool result = d->jscValue.toBoolean(exec);
         QScriptValuePrivate::restoreException(exec, savedException);
         return result;
+        if (d->engine) {
+            QScript::APIShim shim(d->engine);
+            return QScriptEnginePrivate::toBool(d->engine->currentFrame, d->jscValue);
+        } else {
+            return QScriptEnginePrivate::toBool(0, d->jscValue);
+        }
+    }
     case QScriptValuePrivate::Number:
         return (d->numberValue != 0) && !qIsNaN(d->numberValue);
+        return QScript::ToBool(d->numberValue);
     case QScriptValuePrivate::String:
         return (!d->stringValue.isEmpty());
+        return QScript::ToBool(d->stringValue);
+    }
     return false;
 …
     switch (d->type) {
     case QScriptValuePrivate::JavaScriptCore: {
         JSC::ExecState *exec = d->engine ? d->engine->currentFrame : 0;
         JSC::JSValue savedException;
         QScriptValuePrivate::saveException(exec, &savedException);
         qint32 result = d->jscValue.toInt32(exec);
         QScriptValuePrivate::restoreException(exec, savedException);
         return result;
+        if (d->engine) {
+            QScript::APIShim shim(d->engine);
+            return QScriptEnginePrivate::toInt32(d->engine->currentFrame, d->jscValue);
+        } else {
+            return QScriptEnginePrivate::toInt32(0, d->jscValue);
+        }
+    }
     case QScriptValuePrivate::Number:
         return QScript::ToInt32(d->numberValue);
     case QScriptValuePrivate::String:
         return QScript::ToInt32(((JSC::UString)d->stringValue).toDouble());
+        return QScript::ToInt32(d->stringValue);
+    }
     return 0;
 …
     switch (d->type) {
     case QScriptValuePrivate::JavaScriptCore: {
         JSC::ExecState *exec = d->engine ? d->engine->currentFrame : 0;
         JSC::JSValue savedException;
         QScriptValuePrivate::saveException(exec, &savedException);
         quint32 result = d->jscValue.toUInt32(exec);
         QScriptValuePrivate::restoreException(exec, savedException);
         return result;
+        if (d->engine) {
+            QScript::APIShim shim(d->engine);
+            return QScriptEnginePrivate::toUInt32(d->engine->currentFrame, d->jscValue);
+        } else {
+            return QScriptEnginePrivate::toUInt32(0, d->jscValue);
+        }
+    }
     case QScriptValuePrivate::Number:
         return QScript::ToUint32(d->numberValue);
+        return QScript::ToUInt32(d->numberValue);
     case QScriptValuePrivate::String:
         return QScript::ToUint32(((JSC::UString)d->stringValue).toDouble());
+        return QScript::ToUInt32(d->stringValue);
+    }
     return 0;
 …
     switch (d->type) {
     case QScriptValuePrivate::JavaScriptCore: {
+        // ### no equivalent function in JSC
+        return QScript::ToUint16(toNumber());
+        if (d->engine) {
+            QScript::APIShim shim(d->engine);
+            return QScriptEnginePrivate::toUInt16(d->engine->currentFrame, d->jscValue);
+        } else {
+            return QScriptEnginePrivate::toUInt16(0, d->jscValue);
+        }
+    }
     case QScriptValuePrivate::Number:
         return QScript::ToUint16(d->numberValue);
+        return QScript::ToUInt16(d->numberValue);
     case QScriptValuePrivate::String:
         return QScript::ToUint16(((JSC::UString)d->stringValue).toDouble());
+        return QScript::ToUInt16(d->stringValue);
+    }
     return 0;
 …
     switch (d->type) {
     case QScriptValuePrivate::JavaScriptCore: {
         JSC::ExecState *exec = d->engine ? d->engine->currentFrame : 0;
         JSC::JSValue savedException;
         QScriptValuePrivate::saveException(exec, &savedException);
         qsreal result = d->jscValue.toInteger(exec);
         QScriptValuePrivate::restoreException(exec, savedException);
         return result;
+        if (d->engine) {
+            QScript::APIShim shim(d->engine);
+            return QScriptEnginePrivate::toInteger(d->engine->currentFrame, d->jscValue);
+        } else {
+            return QScriptEnginePrivate::toInteger(0, d->jscValue);
+        }
+    }
     case QScriptValuePrivate::Number:
         return QScript::ToInteger(d->numberValue);
     case QScriptValuePrivate::String:
         return QScript::ToInteger(((JSC::UString)d->stringValue).toDouble());
+        return QScript::ToInteger(d->stringValue);
+    }
     return 0;
 …
     \row    \o Date Object \o A QVariant containing the date value (toDateTime()).
     \row    \o RegExp Object \o A QVariant containing the regular expression value (toRegExp()).
     \row    \o Array Object \o The array is converted to a QVariantList.
     \row    \o Object     \o If the value is primitive, then the result is converted to a QVariant according to the above rules; otherwise, an invalid QVariant is returned.
+    \row    \o Array Object \o The array is converted to a QVariantList. Each element is converted to a QVariant, recursively; cyclic references are not followed.
+    \row    \o Object     \o The object is converted to a QVariantMap. Each property is converted to a QVariant, recursively; cyclic references are not followed.
     \endtable
 …
         return QVariant();
     switch (d->type) {
+    case QScriptValuePrivate::JavaScriptCore:
+        if (isObject()) {
+            if (isVariant())
+                return d->variantValue();
+#ifndef QT_NO_QOBJECT
+            else if (isQObject())
+                return qVariantFromValue(toQObject());
+#endif
+            else if (isDate())
+                return QVariant(toDateTime());
+#ifndef QT_NO_REGEXP
+            else if (isRegExp())
+                return QVariant(toRegExp());
+#endif
+            else if (isArray())
+                return QScriptEnginePrivate::variantListFromArray(*this);
+            else if (QScriptDeclarativeClass *dc = QScriptDeclarativeClass::scriptClass(*this))
+                return dc->toVariant(QScriptDeclarativeClass::object(*this));
+            // try to convert to primitive
+            JSC::ExecState *exec = d->engine->currentFrame;
+            JSC::JSValue savedException;
+            QScriptValuePrivate::saveException(exec, &savedException);
+            JSC::JSValue prim = d->jscValue.toPrimitive(exec);
+            QScriptValuePrivate::restoreException(exec, savedException);
+            if (!prim.isObject())
+                return d->engine->scriptValueFromJSCValue(prim).toVariant();
+        } else if (isNumber()) {
+            return QVariant(toNumber());
+        } else if (isString()) {
+            return QVariant(toString());
+        } else if (isBool()) {
+            return QVariant(toBool());
+    case QScriptValuePrivate::JavaScriptCore: {
+        if (d->engine) {
+            QScript::APIShim shim(d->engine);
+            return QScriptEnginePrivate::toVariant(d->engine->currentFrame, d->jscValue);
+        } else {
+            return QScriptEnginePrivate::toVariant(0, d->jscValue);
+        }
         return QVariant();
+    }
     case QScriptValuePrivate::Number:
         return QVariant(d->numberValue);
 …
+{
     Q_D(const QScriptValue);
     if (!isDate())
+    if (!d || !d->engine)
         return QDateTime();
     qsreal t = static_cast<JSC::DateInstance*>(JSC::asObject(d->jscValue))->internalNumber();
     return QScript::ToDateTime(t, Qt::LocalTime);
+    QScript::APIShim shim(d->engine);
+    return QScriptEnginePrivate::toDateTime(d->engine->currentFrame, d->jscValue);
+}
 …
+{
     Q_D(const QScriptValue);
+    if (!isRegExp())
+        return QRegExp();
+    QString pattern = d->property(QLatin1String("source"), QScriptValue::ResolvePrototype).toString();
+    Qt::CaseSensitivity kase = Qt::CaseSensitive;
+    if (d->property(QLatin1String("ignoreCase"), QScriptValue::ResolvePrototype).toBool())
+        kase = Qt::CaseInsensitive;
+    return QRegExp(pattern, kase, QRegExp::RegExp2);
+    if (!d || !d->engine)
+         return QRegExp();
+    QScript::APIShim shim(d->engine);
+    return QScriptEnginePrivate::toRegExp(d->engine->currentFrame, d->jscValue);
+}
 #endif // QT_NO_REGEXP
 …
+{
     Q_D(const QScriptValue);
+    if (isQObject()) {
+        QScriptObject *object = static_cast<QScriptObject*>(JSC::asObject(d->jscValue));
+        QScriptObjectDelegate *delegate = object->delegate();
+        if (delegate->type() == QScriptObjectDelegate::DeclarativeClassObject)
+            return static_cast<QScript::DeclarativeObjectDelegate*>(delegate)->scriptClass()->toQObject(QScriptDeclarativeClass::object(*this));
+        return static_cast<QScript::QObjectDelegate*>(delegate)->value();
+    } else if (isVariant()) {
+        QVariant var = toVariant();
+        int type = var.userType();
+        if ((type == QMetaType::QObjectStar) || (type == QMetaType::QWidgetStar))
+            return *reinterpret_cast<QObject* const *>(var.constData());
+    }
+    return 0;
+    if (!d || !d->engine)
+        return 0;
+    QScript::APIShim shim(d->engine);
+    return QScriptEnginePrivate::toQObject(d->engine->currentFrame, d->jscValue);
+}
 …
+{
     Q_D(const QScriptValue);
+    if (isQMetaObject())
+        return static_cast<QScript::QMetaObjectWrapperObject*>(JSC::asObject(d->jscValue))->value();
+    return 0;
+    if (!d || !d->engine)
+        return 0;
+    QScript::APIShim shim(d->engine);
+    return QScriptEnginePrivate::toQMetaObject(d->engine->currentFrame, d->jscValue);
+}
 …
     if (!d || !d->isObject())
         return;
+    JSC::ExecState *exec = d->engine->currentFrame;
+    d->setProperty(JSC::Identifier(exec, name), value, flags);
+    QScript::APIShim shim(d->engine);
+    QScriptEnginePrivate *valueEngine = QScriptValuePrivate::getEngine(value);
+    if (valueEngine && (valueEngine != d->engine)) {
+        qWarning("QScriptValue::setProperty(%s) failed: "
+                 "cannot set value created in a different engine",
+                 qPrintable(name));
+        return;
+    }
+    JSC::JSValue jsValue = d->engine->scriptValueToJSCValue(value);
+    d->setProperty(name, jsValue, flags);
+}
 …
     if (!d || !d->isObject())
         return QScriptValue();
+    return d->property(name, mode);
+    QScript::APIShim shim(d->engine);
+    return d->engine->scriptValueFromJSCValue(d->property(name, mode));
+}
 …
     if (!d || !d->isObject())
         return QScriptValue();
+    return d->property(arrayIndex, mode);
+    QScript::APIShim shim(d->engine);
+    return d->engine->scriptValueFromJSCValue(d->property(arrayIndex, mode));
+}
 …
         return;
+    }
+    JSC::ExecState *exec = d->engine->currentFrame;
+    JSC::JSValue jscValue = d->engine->scriptValueToJSCValue(value);
+    if (!jscValue) {
+        JSC::asObject(d->jscValue)->deleteProperty(exec, arrayIndex, /*checkDontDelete=*/false);
+    } else {
+        if ((flags & QScriptValue::PropertyGetter) || (flags & QScriptValue::PropertySetter)) {
+            // fall back to string-based setProperty(), since there is no
+            // JSC::JSObject::defineGetter(unsigned)
+            d->setProperty(JSC::Identifier::from(exec, arrayIndex), value, flags);
+        } else {
+            if (flags != QScriptValue::KeepExistingFlags) {
+//                if (JSC::asObject(d->jscValue)->hasOwnProperty(exec, arrayIndex))
+//                    JSC::asObject(d->jscValue)->deleteProperty(exec, arrayIndex);
+                unsigned attribs = 0;
+                if (flags & QScriptValue::ReadOnly)
+                    attribs |= JSC::ReadOnly;
+                if (flags & QScriptValue::SkipInEnumeration)
+                    attribs |= JSC::DontEnum;
+                if (flags & QScriptValue::Undeletable)
+                    attribs |= JSC::DontDelete;
+                attribs |= flags & QScriptValue::UserRange;
+                JSC::asObject(d->jscValue)->putWithAttributes(exec, arrayIndex, jscValue, attribs);
+            } else {
+                JSC::asObject(d->jscValue)->put(exec, arrayIndex, jscValue);
+            }
+        }
+    }
+    QScript::APIShim shim(d->engine);
+    JSC::JSValue jsValue = d->engine->scriptValueToJSCValue(value);
+    d->setProperty(arrayIndex, jsValue, flags);
+}
 …
     if (!d || !d->isObject() || !QScriptStringPrivate::isValid(name))
         return QScriptValue();
+    return d->property(name.d_ptr->identifier, mode);
+    QScript::APIShim shim(d->engine);
+    return d->engine->scriptValueFromJSCValue(d->property(name.d_ptr->identifier, mode));
+}
 …
     if (!d || !d->isObject() || !QScriptStringPrivate::isValid(name))
         return;
+    d->setProperty(name.d_ptr->identifier, value, flags);
+    QScriptEnginePrivate *valueEngine = QScriptValuePrivate::getEngine(value);
+    if (valueEngine && (valueEngine != d->engine)) {
+        qWarning("QScriptValue::setProperty(%s) failed: "
+                 "cannot set value created in a different engine",
+                 qPrintable(name.toString()));
+        return;
+    }
+    QScript::APIShim shim(d->engine);
+    JSC::JSValue jsValue = d->engine->scriptValueToJSCValue(value);
+    d->setProperty(name.d_ptr->identifier, jsValue, flags);
+}
 …
     if (!d || !d->isObject())
         return 0;
+    QScript::APIShim shim(d->engine);
     JSC::ExecState *exec = d->engine->currentFrame;
     return d->propertyFlags(JSC::Identifier(exec, name), mode);
 …
+{
     Q_D(const QScriptValue);
     if (!d || !d->isJSC())
+    if (!d || !d->isObject())
         return QScriptValue();
+    QScript::APIShim shim(d->engine);
     JSC::JSValue callee = d->jscValue;
     JSC::CallData callData;
 …
     JSC::JSValue savedException;
     QScriptValuePrivate::saveException(exec, &savedException);
+    QScriptEnginePrivate::saveException(exec, &savedException);
     JSC::JSValue result = JSC::call(exec, callee, callType, callData, jscThisObject, jscArgs);
     if (exec->hadException()) {
         result = exec->exception();
     } else {
         QScriptValuePrivate::restoreException(exec, savedException);
+        QScriptEnginePrivate::restoreException(exec, savedException);
+    }
     return d->engine->scriptValueFromJSCValue(result);
 …
+{
     Q_D(QScriptValue);
     if (!d || !d->isJSC())
+    if (!d || !d->isObject())
         return QScriptValue();
+    QScript::APIShim shim(d->engine);
     JSC::JSValue callee = d->jscValue;
     JSC::CallData callData;
 …
     JSC::JSValue savedException;
     QScriptValuePrivate::saveException(exec, &savedException);
+    QScriptEnginePrivate::saveException(exec, &savedException);
     JSC::JSValue result = JSC::call(exec, callee, callType, callData, jscThisObject, applyArgs);
     if (exec->hadException()) {
         result = exec->exception();
     } else {
         QScriptValuePrivate::restoreException(exec, savedException);
+        QScriptEnginePrivate::restoreException(exec, savedException);
+    }
     return d->engine->scriptValueFromJSCValue(result);
 …
+{
     Q_D(const QScriptValue);
     if (!d || !d->isJSC())
+    if (!d || !d->isObject())
         return QScriptValue();
+    QScript::APIShim shim(d->engine);
     JSC::JSValue callee = d->jscValue;
     JSC::ConstructData constructData;
 …
     JSC::JSValue savedException;
+    QScriptValuePrivate::saveException(exec, &savedException);
+    JSC::JSObject *result = JSC::construct(exec, callee, constructType, constructData, jscArgs);
+    QScriptEnginePrivate::saveException(exec, &savedException);
+    JSC::JSValue result;
+    JSC::JSObject *newObject = JSC::construct(exec, callee, constructType, constructData, jscArgs);
     if (exec->hadException()) {
         result = JSC::asObject(exec->exception());
+        result = exec->exception();
     } else {
+        QScriptValuePrivate::restoreException(exec, savedException);
+        result = newObject;
+        QScriptEnginePrivate::restoreException(exec, savedException);
+    }
     return d->engine->scriptValueFromJSCValue(result);
 …
+{
     Q_D(QScriptValue);
     if (!d || !d->isJSC())
+    if (!d || !d->isObject())
         return QScriptValue();
+    QScript::APIShim shim(d->engine);
     JSC::JSValue callee = d->jscValue;
     JSC::ConstructData constructData;
 …
     JSC::JSValue savedException;
+    QScriptValuePrivate::saveException(exec, &savedException);
+    JSC::JSObject *result = JSC::construct(exec, callee, constructType, constructData, applyArgs);
+    QScriptEnginePrivate::saveException(exec, &savedException);
+    JSC::JSValue result;
+    JSC::JSObject *newObject = JSC::construct(exec, callee, constructType, constructData, applyArgs);
     if (exec->hadException()) {
+        if (exec->exception().isObject())
+            result = JSC::asObject(exec->exception());
+        result = exec->exception();
     } else {
+        QScriptValuePrivate::restoreException(exec, savedException);
+        result = newObject;
+        QScriptEnginePrivate::restoreException(exec, savedException);
+    }
     return d->engine->scriptValueFromJSCValue(result);
 …
+{
     Q_D(const QScriptValue);
     if (!d || !d->isJSC() || !d->jscValue.inherits(&QScriptObject::info))
+    if (!d || !d->isJSC())
         return false;
+    QScriptObject *object = static_cast<QScriptObject*>(JSC::asObject(d->jscValue));
+    QScriptObjectDelegate *delegate = object->delegate();
+    return (delegate && (delegate->type() == QScriptObjectDelegate::Variant));
+    return QScriptEnginePrivate::isVariant(d->jscValue);
+}
 …
+{
     Q_D(const QScriptValue);
     if (!d || !d->isJSC() || !d->jscValue.inherits(&QScriptObject::info))
+    if (!d || !d->isJSC())
         return false;
+    QScriptObject *object = static_cast<QScriptObject*>(JSC::asObject(d->jscValue));
+    QScriptObjectDelegate *delegate = object->delegate();
+    return (delegate && (delegate->type() == QScriptObjectDelegate::QtObject ||
+                         (delegate->type() == QScriptObjectDelegate::DeclarativeClassObject &&
+                          static_cast<QScript::DeclarativeObjectDelegate*>(delegate)->scriptClass()->isQObject())));
+    return QScriptEnginePrivate::isQObject(d->jscValue);
+}
 …
+{
     Q_D(const QScriptValue);
     if (!d || !d->isObject())
+    if (!d || !d->isJSC())
         return false;
     return JSC::asObject(d->jscValue)->inherits(&QScript::QMetaObjectWrapperObject::info);
+    return QScriptEnginePrivate::isQMetaObject(d->jscValue);
+}
 …
     } else {
         // ### make hidden property
         return d->property(QLatin1String("__qt_data__"), QScriptValue::ResolveLocal);
+        return property(QLatin1String("__qt_data__"), QScriptValue::ResolveLocal);
+    }
+}
 …
   accessible to scripts, but may be retrieved in C++ using the data()
   function.
+  \sa QScriptEngine::reportAdditionalMemoryCost()
 */
 void QScriptValue::setData(const QScriptValue &data)
 …
     if (!d || !d->isObject())
         return;
+    QScript::APIShim shim(d->engine);
     JSC::JSValue other = d->engine->scriptValueToJSCValue(data);
     if (d->jscValue.inherits(&QScriptObject::info)) {

trunk/src/script/api/qscriptvalue.h

r651	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/script/api/qscriptvalue_p.h

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
     inline bool isObject() const;
-    QVariant &variantValue() const;
-    void setVariantValue(const QVariant &value);
     static inline QScriptValuePrivate *get(const QScriptValue &q)
+    {
 …
+    }
+    inline QScriptValue property(const JSC::Identifier &id, int resolveMode) const;
+    QScriptValue propertyHelper(const JSC::Identifier &id, int resolveMode) const;
+    inline QScriptValue property(quint32 index, int resolveMode) const;
+    QScriptValue propertyHelper(quint32, int resolveMode) const;
+    inline QScriptValue property(const QString &, int resolveMode) const;
+    void setProperty(const JSC::Identifier &id, const QScriptValue &value,
+                     const QScriptValue::PropertyFlags &flags);
+    QScriptValue::PropertyFlags propertyFlags(
+        const JSC::Identifier &id, const QScriptValue::ResolveFlags &mode) const;
+    inline JSC::JSValue property(const JSC::Identifier &id,
+                                 const QScriptValue::ResolveFlags &mode = QScriptValue::ResolvePrototype) const;
+    inline JSC::JSValue property(quint32 index, const QScriptValue::ResolveFlags &mode = QScriptValue::ResolvePrototype) const;
+    inline JSC::JSValue property(const JSC::UString &, const QScriptValue::ResolveFlags &mode = QScriptValue::ResolvePrototype) const;
+    inline void setProperty(const JSC::UString &name, const JSC::JSValue &value,
+                            const QScriptValue::PropertyFlags &flags = QScriptValue::KeepExistingFlags);
+    inline void setProperty(const JSC::Identifier &id, const JSC::JSValue &value,
+                            const QScriptValue::PropertyFlags &flags = QScriptValue::KeepExistingFlags);
+    inline void setProperty(quint32 index, const JSC::JSValue &value,
+                            const QScriptValue::PropertyFlags &flags = QScriptValue::KeepExistingFlags);
+    inline QScriptValue::PropertyFlags propertyFlags(
+        const JSC::Identifier &id, const QScriptValue::ResolveFlags &mode = QScriptValue::ResolvePrototype) const;
     void detachFromEngine();
 …
     qint64 objectId()
+    {
         if ( (type == JavaScriptCore) && (engine) )
+        if ( (type == JavaScriptCore) && (engine) && jscValue.isCell() )
             return (qint64)jscValue.asCell();
         else
             return -1;
+    }
-    static inline void saveException(JSC::ExecState*, JSC::JSValue*);
-    static inline void restoreException(JSC::ExecState*, JSC::JSValue);
     QScriptEnginePrivate *engine;

trunk/src/script/api/qscriptvalueiterator.cpp

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
         : initialized(false)
     {}
+    ~QScriptValueIteratorPrivate()
+    {
+        if (!initialized)
+            return;
+        QScriptEnginePrivate *eng_p = engine();
+        if (!eng_p)
+            return;
+        QScript::APIShim shim(eng_p);
+        propertyNames.clear(); //destroying the identifiers need to be done under the APIShim guard
+    }
+    QScriptValuePrivate *object() const
+    {
+        return QScriptValuePrivate::get(objectValue);
+    }
+    QScriptEnginePrivate *engine() const
+    {
+        return QScriptEnginePrivate::get(objectValue.engine());
+    }
     void ensureInitialized()
+    {
         if (initialized)
             return;
+        QScriptEnginePrivate *eng_p = QScriptEnginePrivate::get(object.engine());
+        QScriptEnginePrivate *eng_p = engine();
+        QScript::APIShim shim(eng_p);
         JSC::ExecState *exec = eng_p->globalExec();
         JSC::PropertyNameArray propertyNamesArray(exec);
+        propertyNamesArray.setShouldCache(false);
+        JSC::asObject(QScriptValuePrivate::get(object)->jscValue)->getOwnPropertyNames(exec, propertyNamesArray, /*includeNonEnumerable=*/true);
+        JSC::asObject(object()->jscValue)->getOwnPropertyNames(exec, propertyNamesArray, JSC::IncludeDontEnumProperties);
         JSC::PropertyNameArray::const_iterator propertyNamesIt = propertyNamesArray.begin();
         for(; propertyNamesIt != propertyNamesArray.end(); ++propertyNamesIt) {
             propertyNames.append(propertyNamesIt->ustring());
+            propertyNames.append(*propertyNamesIt);
+        }
         it = propertyNames.begin();
 …
+    }
     QScriptValue object;
     QLinkedList<JSC::UString> propertyNames;
     QLinkedList<JSC::UString>::iterator it;
     QLinkedList<JSC::UString>::iterator current;
+    QScriptValue objectValue;
+    QLinkedList<JSC::Identifier> propertyNames;
+    QLinkedList<JSC::Identifier>::iterator it;
+    QLinkedList<JSC::Identifier>::iterator current;
     bool initialized;
 };
 …
     if (object.isObject()) {
         d_ptr.reset(new QScriptValueIteratorPrivate());
         d_ptr->object = object;
+        d_ptr->objectValue = object;
+    }
+}
 …
+{
     Q_D(const QScriptValueIterator);
     if (!d || !d->initialized)
+    if (!d || !d->initialized || !d->engine())
         return QString();
     return *d->current;
+    return d->current->ustring();
+}
 …
+{
     Q_D(const QScriptValueIterator);
     if (!d || !d->initialized)
+    if (!d || !d->initialized || !d->engine())
         return QScriptString();
     return d->object.engine()->toStringHandle(name());
+    return d->engine()->toStringHandle(*d->current);
+}
 …
+{
     Q_D(const QScriptValueIterator);
     if (!d || !d->initialized)
+    if (!d || !d->initialized || !d->engine())
         return QScriptValue();
+    return d->object.property(name());
+    QScript::APIShim shim(d->engine());
+    JSC::JSValue jsValue = d->object()->property(*d->current);
+    return d->engine()->scriptValueFromJSCValue(jsValue);
+}
 …
+{
     Q_D(QScriptValueIterator);
+    if (!d || !d->initialized)
+        return;
+    d->object.setProperty(name(), value);
+    if (!d || !d->initialized || !d->engine())
+        return;
+    QScript::APIShim shim(d->engine());
+    JSC::JSValue jsValue = d->engine()->scriptValueToJSCValue(value);
+    d->object()->setProperty(*d->current, jsValue);
+}
 …
+{
     Q_D(const QScriptValueIterator);
     if (!d || !d->initialized)
+    if (!d || !d->initialized || !d->engine())
         return 0;
+    return d->object.propertyFlags(name());
+    QScript::APIShim shim(d->engine());
+    return d->object()->propertyFlags(*d->current);
+}
 …
+{
     Q_D(QScriptValueIterator);
+    if (!d || !d->initialized)
+        return;
+    d->object.setProperty(name(), QScriptValue());
+    if (!d || !d->initialized || !d->engine())
+        return;
+    QScript::APIShim shim(d->engine());
+    d->object()->setProperty(*d->current, JSC::JSValue());
     d->propertyNames.erase(d->current);
+}
 …
     if (object.isObject()) {
         d_ptr.reset(new QScriptValueIteratorPrivate());
         d_ptr->object = object;
+        d_ptr->objectValue = object;
+    }
     return *this;

trunk/src/script/api/qscriptvalueiterator.h

r651	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

Context Navigation

Legend:

trunk

trunk/src/script/api/qscriptable.cpp

trunk/src/script/api/qscriptable.h

trunk/src/script/api/qscriptable_p.h

trunk/src/script/api/qscriptclass.cpp

trunk/src/script/api/qscriptclass.h

trunk/src/script/api/qscriptclasspropertyiterator.cpp

trunk/src/script/api/qscriptclasspropertyiterator.h

trunk/src/script/api/qscriptcontext.cpp

trunk/src/script/api/qscriptcontext.h

trunk/src/script/api/qscriptcontext_p.h

trunk/src/script/api/qscriptcontextinfo.cpp

trunk/src/script/api/qscriptcontextinfo.h

trunk/src/script/api/qscriptengine.cpp

trunk/src/script/api/qscriptengine.h

trunk/src/script/api/qscriptengine_p.h

trunk/src/script/api/qscriptengineagent.cpp

trunk/src/script/api/qscriptengineagent.h

trunk/src/script/api/qscriptengineagent_p.h

trunk/src/script/api/qscriptextensioninterface.h

trunk/src/script/api/qscriptextensionplugin.cpp

trunk/src/script/api/qscriptextensionplugin.h

trunk/src/script/api/qscriptprogram.cpp

trunk/src/script/api/qscriptprogram.h

trunk/src/script/api/qscriptprogram_p.h

trunk/src/script/api/qscriptstring.cpp

trunk/src/script/api/qscriptstring.h

trunk/src/script/api/qscriptstring_p.h

trunk/src/script/api/qscriptvalue.cpp

trunk/src/script/api/qscriptvalue.h

trunk/src/script/api/qscriptvalue_p.h

trunk/src/script/api/qscriptvalueiterator.cpp

trunk/src/script/api/qscriptvalueiterator.h

Download in other formats:

/branches/vendor/nokia/qt/4.7.2 (added)	merged: 845
/branches/vendor/nokia/qt/current	merged: 844
/branches/vendor/nokia/qt/4.6.3	removed