Changeset 846 for trunk/src/script/api/qscriptengine.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/script/api/qscriptengine.cpp (modified) (79 diffs)

trunk/src/script/api/qscriptengine.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** 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)
@@ -25 +25 @@
 #include "qscriptengine.h"
 #include "qscriptsyntaxchecker_p.h"
-#include "qnumeric.h"
 
 #include "qscriptengine_p.h"
@@ -42 +41 @@
 #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"
@@ -58 +56 @@
 #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"
@@ -68 +65 @@
 #include "bridge/qscriptglobalobject_p.h"
 #include "bridge/qscriptactivationobject_p.h"
+#include "bridge/qscriptstaticscopeobject_p.h"
 
 #ifndef QT_NO_QOBJECT
@@ -155 +153 @@
   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.
@@ -265 +262 @@
   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
 
@@ -282 +295 @@
     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).
+
 */
 
@@ -297 +321 @@
     \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.
@@ -329 +354 @@
 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)
@@ -484 +639 @@
             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);
         }
     }
@@ -568 +721 @@
             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);
         }
     }
@@ -633 +784 @@
 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)
@@ -649 +802 @@
         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
@@ -670 +823 @@
         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
@@ -700 +853 @@
         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;
             }
@@ -714 +869 @@
     }
 #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);
@@ -723 +878 @@
         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
@@ -736 +891 @@
 
 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)
@@ -793 +970 @@
     }
     JSC::initializeThreading();
-
+    JSC::IdentifierTable *oldTable = JSC::currentIdentifierTable();
     globalData = JSC::JSGlobalData::create().releaseRef();
     globalData->clientData = new QScript::GlobalClientData(this);
@@ -801 +978 @@
 
     scriptObjectStructure = QScriptObject::createStructure(globalObject->objectPrototype());
+    staticScopeObjectStructure = QScriptStaticScopeObject::createStructure(JSC::jsNull());
 
     qobjectPrototype = new (exec) QScript::QObjectPrototype(exec, QScript::QObjectPrototype::createStructure(globalObject->objectPrototype()), globalObject->prototypeFunctionStructure());
@@ -829 +1007 @@
     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;
@@ -841 +1024 @@
         delete ownedAgents.takeFirst();
 
+    detachAllRegisteredScriptPrograms();
     detachAllRegisteredScriptValues();
     detachAllRegisteredScriptStrings();
     qDeleteAll(m_qobjectData);
     qDeleteAll(m_typeInfos);
-    JSC::JSLock lock(false);
     globalData->heap.destroy();
     globalData->deref();
@@ -855 +1038 @@
 }
 
-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));
@@ -882 +1057 @@
         }
     }
-
     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;
 }
@@ -1160 +1317 @@
 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);
 }
 
@@ -1183 +1346 @@
 {
     Q_Q(QScriptEngine);
-    JSC::JSLock lock(false); // ### hmmm
     QBoolBlocker inEvalBlocker(inEval, true);
     q->currentContext()->activationObject(); //force the creation of a context for native function;
@@ -1192 +1354 @@
 
     q->clearExceptions();
-    JSC::DynamicGlobalObjectScope dynamicGlobalObjectScope(exec, exec->scopeChain()->globalObject());
+    JSC::DynamicGlobalObjectScope dynamicGlobalObjectScope(exec, exec->scopeChain()->globalObject);
 
     if (compile) {
@@ -1296 +1458 @@
 }
 
-bool QScriptEnginePrivate::convertToNativeQObject(const QScriptValue &value,
+bool QScriptEnginePrivate::convertToNativeQObject(JSC::ExecState *exec, JSC::JSValue value,
                                                   const QByteArray &targetType,
                                                   void **result)
@@ -1302 +1464 @@
     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);
@@ -1417 +1579 @@
 #endif
 
+void QScriptEnginePrivate::detachAllRegisteredScriptPrograms()
+{
+    QSet<QScriptProgramPrivate*>::const_iterator it;
+    for (it = registeredScriptPrograms.constBegin(); it != registeredScriptPrograms.constEnd(); ++it)
+        (*it)->detachFromEngine();
+    registeredScriptPrograms.clear();
+}
+
 void QScriptEnginePrivate::detachAllRegisteredScriptValues()
 {
@@ -1443 +1613 @@
 }
 
-#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));
@@ -1648 +1651 @@
             case ']':
                 inBracket = false;
-                break;
+               break;
             default:
                 break;
@@ -1663 +1666 @@
     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));
@@ -1982 +1686 @@
     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));
 }
 
@@ -1994 +2414 @@
 {
     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));
 }
 
@@ -2008 +2425 @@
 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));
 }
 
@@ -2031 +2450 @@
 {
     Q_D(QScriptEngine);
+    QScript::APIShim shim(d);
     JSC::JSValue jscCtor = d->scriptValueToJSCValue(ctor);
     JSC::JSValue jscQMetaObject = d->newQMetaObject(metaObject, jscCtor);
@@ -2205 +2625 @@
 {
     Q_D(QScriptEngine);
+    QScript::APIShim shim(d);
     WTF::PassRefPtr<QScript::UStringSourceProviderWithFeedback> provider
             = QScript::UStringSourceProviderWithFeedback::create(program, fileName, lineNumber, d);
@@ -2211 +2632 @@
 
     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
@@ -2230 +2650 @@
         return QScriptValue();
 
+    QScript::APIShim shim(d);
     JSC::ExecState* exec = d->currentFrame;
     JSC::EvalExecutable *executable = program_d->executable(exec, d);
@@ -2281 +2702 @@
 {
     Q_D(QScriptEngine);
+    QScript::APIShim shim(d);
 
     JSC::CallFrame* newFrame = d->pushContext(d->currentFrame, d->currentFrame->globalData().dynamicGlobalObject,
@@ -2341 +2763 @@
             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 {
@@ -2372 +2792 @@
         agent()->contextPop();
     Q_D(QScriptEngine);
+    QScript::APIShim shim(d);
     if (d->currentFrame->returnPC() != 0 || d->currentFrame->codeBlock() != 0
         || !currentContext()->parentContext()) {
@@ -2407 +2828 @@
   The exception state is cleared when evaluate() is called.
 
-  \sa uncaughtException(), uncaughtExceptionLineNumber(),
-      uncaughtExceptionBacktrace()
+  \sa uncaughtException(), uncaughtExceptionLineNumber()
 */
 bool QScriptEngine::hasUncaughtException() const
@@ -2426 +2846 @@
 
   \sa hasUncaughtException(), uncaughtExceptionLineNumber(),
-      uncaughtExceptionBacktrace()
 */
 QScriptValue QScriptEngine::uncaughtException() const
@@ -2446 +2865 @@
   the second argument to evaluate().
 
-  \sa hasUncaughtException(), uncaughtExceptionBacktrace()
+  \sa hasUncaughtException()
 */
 int QScriptEngine::uncaughtExceptionLineNumber() const
@@ -2458 +2877 @@
   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()
@@ -2567 +2986 @@
 {
     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
@@ -2639 +3059 @@
         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();
             }
 
@@ -2652 +3075 @@
             // 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;
         }
@@ -2696 +3115 @@
     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:
@@ -2717 +3136 @@
             *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;
@@ -2761 +3180 @@
 #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);
@@ -2775 +3194 @@
 #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:
     ;
@@ -2795 +3217 @@
     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();
@@ -2806 +3228 @@
         } 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;
                 }
@@ -2828 +3250 @@
                     return true;
                 }
-                proto = proto.prototype();
+                proto = JSC::asObject(proto)->prototype();
             }
         }
@@ -2837 +3259 @@
         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;
     }
@@ -2850 +3269 @@
             return false;
         qScriptRegisterSequenceMetaType<QObjectList>(eng->q_func());
-        return convert(value, type, ptr, eng);
+        return convertValue(exec, value, type, ptr);
     }
 #endif
@@ -2857 +3276 @@
             return false;
         qScriptRegisterSequenceMetaType<QList<int> >(eng->q_func());
-        return convert(value, type, ptr, eng);
+        return convertValue(exec, value, type, ptr);
     }
 
@@ -2869 +3288 @@
 }
 
+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
 {
@@ -2875 +3390 @@
 }
 
+JSC::UString QScriptEnginePrivate::translationContextFromUrl(const JSC::UString &url)
+{
+    if (url != cachedTranslationUrl) {
+        cachedTranslationContext = QFileInfo(url).baseName();
+        cachedTranslationUrl = url;
+    }
+    return cachedTranslationContext;
+}
+
 /*!
     \internal
@@ -2881 +3405 @@
 {
     Q_D(QScriptEngine);
-    return QScriptEnginePrivate::convert(value, type, ptr, d);
+    QScript::APIShim shim(d);
+    return QScriptEnginePrivate::convertValue(d->currentFrame, d->scriptValueToJSCValue(value), type, ptr);
 }
 
@@ -2889 +3414 @@
 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;
 }
 
@@ -2900 +3442 @@
 {
     Q_D(QScriptEngine);
+    QScript::APIShim shim(d);
     QScriptTypeInfo *info = d->m_typeInfos.value(type);
     if (!info) {
@@ -2925 +3468 @@
     \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
 
@@ -2932 +3477 @@
 {
     Q_D(QScriptEngine);
+    QScript::APIShim shim(d);
     JSC::ExecState* exec = d->currentFrame;
     JSC::JSValue jscObject = d->scriptValueToJSCValue(object);
@@ -2940 +3486 @@
     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));
@@ -2965 +3513 @@
 #else
     Q_D(QScriptEngine);
+    QScript::APIShim shim(d);
     if (d->importedExtensions.contains(extension))
         return undefinedValue(); // already imported
@@ -3461 +4010 @@
   request that garbage collection should be performed as soon as
   possible.
+
+  \sa reportAdditionalMemoryCost()
 */
 void QScriptEngine::collectGarbage()
@@ -3466 +4017 @@
     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);
 }
 
@@ -3548 +4126 @@
 {
     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));
 }
 
@@ -3576 +4156 @@
         return false;
     QScriptEnginePrivate *engine = QScriptEnginePrivate::get(function.engine());
+    QScript::APIShim shim(engine);
     JSC::JSValue jscReceiver = engine->scriptValueToJSCValue(receiver);
     JSC::JSValue jscFunction = engine->scriptValueToJSCValue(function);
@@ -3602 +4183 @@
         return false;
     QScriptEnginePrivate *engine = QScriptEnginePrivate::get(function.engine());
+    QScript::APIShim shim(engine);
     JSC::JSValue jscReceiver = engine->scriptValueToJSCValue(receiver);
     JSC::JSValue jscFunction = engine->scriptValueToJSCValue(function);
@@ -3646 +4228 @@
         return;
     }
+    QScript::APIShim shim(d);
     if (d->activeAgent)
         QScriptEngineAgentPrivate::get(d->activeAgent)->detach();
@@ -3681 +4264 @@
 {
     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));
 }
 
@@ -3710 +4290 @@
 {
     Q_D(QScriptEngine);
+    QScript::APIShim shim(d);
     JSC::JSValue jscValue = d->scriptValueToJSCValue(value);
     if (!jscValue || jscValue.isUndefined() || jscValue.isNull())
@@ -3861 +4442 @@
 #endif
 
+#ifdef Q_CC_MSVC
+// Try to prevent compiler from crashing.
+#pragma optimize("", off)
+#endif
+
 QT_END_NAMESPACE