diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2010-03-16 15:57:49 (GMT) |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2010-03-16 15:57:49 (GMT) |
| commit | d10667052db5dc2f4d1c7a7c161b040e9747897e (patch) | |
| tree | 9239a131e77416ef1508021af9e4653117865237 /src | |
| parent | 4574b41dfb56652e806afd1dd64cc8b300284570 (diff) | |
| download | Qt-d10667052db5dc2f4d1c7a7c161b040e9747897e.zip Qt-d10667052db5dc2f4d1c7a7c161b040e9747897e.tar.gz Qt-d10667052db5dc2f4d1c7a7c161b040e9747897e.tar.bz2 | |
QtScript: Fix regression when calling newQObject() from native constructor
The thisObject passed to native constructors did not have all
the new structure flags, so if it was promoted to a QObject
(using the overload of newQObject() that takes an existing
script object as first argument), the resulting script object
did not receive dynamic property access callbacks.
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSObject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSObject.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSObject.cpp index c6835fe..0e3475f 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSObject.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSObject.cpp @@ -534,7 +534,7 @@ Structure* JSObject::createInheritorID() { #ifdef QT_BUILD_SCRIPT_LIB // ### QtScript needs the hasOwnProperty() calls etc. for QScriptObject - m_inheritorID = Structure::create(this, TypeInfo(ObjectType, ImplementsHasInstance)); + m_inheritorID = Structure::create(this, TypeInfo(ObjectType, ImplementsHasInstance | JSC::OverridesHasInstance | JSC::OverridesGetOwnPropertySlot | JSC::OverridesMarkChildren | JSC::OverridesGetPropertyNames)); #else m_inheritorID = JSObject::createStructure(this); #endif |