add some world-class hacks to JSC to make QtScript work

QtScript needs the VM to create script objects of type
QScriptObject, not JSC::Object. This is so that the class of
the object can be changed dynamically using e.g.
QScriptValue::setScriptClass(), or the overload of
QScriptEngine::newQObject() that takes an existing object
as first argument (it "promotes" the plain script object to
a QObject wrapper).

This makes the bindings produced by the bindings generator
work.

When JSC becomes a shared library, we need another solution.

1 files changed, 5 insertions, 0 deletions

diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/JSObject.cpp b/src/3rdparty/webkit/JavaScriptCore/runtime/JSObject.cpp
index 415c25d..a54c322 100644
--- a/src/3rdparty/webkit/JavaScriptCore/runtime/JSObject.cpp
+++ b/src/3rdparty/webkit/JavaScriptCore/runtime/JSObject.cpp
@@ -524,7 +524,12 @@ NEVER_INLINE void JSObject::fillGetterPropertySlot(PropertySlot& slot, JSValue*
 
 Structure* JSObject::createInheritorID()
 {
+#ifdef QT_BUILD_SCRIPT_LIB
+    // ### QtScript needs the hasOwnProperty() calls etc. for QScriptObject
+    m_inheritorID = Structure::create(this, TypeInfo(ObjectType, ImplementsHasInstance));
+#else
     m_inheritorID = JSObject::createStructure(this);
+#endif
     return m_inheritorID.get();
 }