From 3c00934966ae172fc7496a120ca45e78e58ab33a Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 13 Dec 2015 14:49:29 +0200 Subject: [PATCH] improve handling of QScriptEngine::ExcludeDeleteLater upstream commits: 58dc831e557eb533bf40c9ff7b79d01d58b6de98 0ff8577a992b1d5c011b04e47ade84074cbd3034 Signed-off-by: Ivailo Monev --- src/script/bridge/qscriptqobject.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/script/bridge/qscriptqobject.cpp b/src/script/bridge/qscriptqobject.cpp index de13cf665..d90a75f23 100644 --- a/src/script/bridge/qscriptqobject.cpp +++ b/src/script/bridge/qscriptqobject.cpp @@ -147,8 +147,9 @@ private: static bool hasMethodAccess(const QMetaMethod &method, int index, const QScriptEngine::QObjectWrapOptions &opt) { + static const int deleteLaterIndex = QObject::staticMetaObject.indexOfMethod("deleteLater()"); return (method.access() != QMetaMethod::Private) - && ((index != 2) || !(opt & QScriptEngine::ExcludeDeleteLater)) + && ((index != deleteLaterIndex) || !(opt & QScriptEngine::ExcludeDeleteLater)) && (!(opt & QScriptEngine::ExcludeSlots) || (method.methodType() != QMetaMethod::Slot)); }