Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 02:42:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

improve handling of QScriptEngine::ExcludeDeleteLater

Browse source 
upstream commits:
58dc831e557eb533bf40c9ff7b79d01d58b6de98
0ff8577a992b1d5c011b04e47ade84074cbd3034

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2015-12-13 14:49:29 +02:00
parent 49c09b6593
commit 3c00934966
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/script/bridge/qscriptqobject.cpp
View file

@ -147,8 +147,9 @@ private:
static bool hasMethodAccess(const QMetaMethod &method, int index, const QScriptEngine::QObjectWrapOptions &opt) 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) return (method.access() != QMetaMethod::Private)
&& ((index != 2) || !(opt & QScriptEngine::ExcludeDeleteLater)) && ((index != deleteLaterIndex) || !(opt & QScriptEngine::ExcludeDeleteLater))
&& (!(opt & QScriptEngine::ExcludeSlots) || (method.methodType() != QMetaMethod::Slot)); && (!(opt & QScriptEngine::ExcludeSlots) || (method.methodType() != QMetaMethod::Slot));
} }