diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-18 08:05:48 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-18 08:05:48 (GMT) |
| commit | 0191608870c11db956ddc1725055bc7baf33cb39 (patch) | |
| tree | a1af91c2402dbed6c17c65da3f459a398e5ead02 /src | |
| parent | 70d5461354feddd530f718487e82140c0fc59b38 (diff) | |
| download | Qt-0191608870c11db956ddc1725055bc7baf33cb39.zip Qt-0191608870c11db956ddc1725055bc7baf33cb39.tar.gz Qt-0191608870c11db956ddc1725055bc7baf33cb39.tar.bz2 | |
port commit 8fca9052e72d1dc983443c3a8065f804bebf77e7 from qt/master
QtScript must respect dynamic metaobjects when installed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/script/bridge/qscriptqobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/bridge/qscriptqobject.cpp b/src/script/bridge/qscriptqobject.cpp index 695db9f..ffb5d1a 100644 --- a/src/script/bridge/qscriptqobject.cpp +++ b/src/script/bridge/qscriptqobject.cpp @@ -959,7 +959,7 @@ static JSC::JSValue callQtMethod(JSC::ExecState *exec, QMetaMethod::MethodType c Q_ASSERT(meta != 0); meta->static_metacall(QMetaObject::CreateInstance, chosenIndex, params); } else { - thisQObject->qt_metacall(QMetaObject::InvokeMetaMethod, chosenIndex, params); + QMetaObject::metacall(thisQObject, QMetaObject::InvokeMetaMethod, chosenIndex, params); } if (scriptable) |