From 0191608870c11db956ddc1725055bc7baf33cb39 Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Tue, 18 Aug 2009 10:05:48 +0200 Subject: port commit 8fca9052e72d1dc983443c3a8065f804bebf77e7 from qt/master QtScript must respect dynamic metaobjects when installed. --- src/script/bridge/qscriptqobject.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) -- cgit v0.12