diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-01-09 10:05:05 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-09 11:05:58 +0100 |
| commit | 0ff8577a992b1d5c011b04e47ade84074cbd3034 (patch) | |
| tree | 49d746fd261dba4f8c99fe47fe072da0ca53f609 /src/script/bridge/qscriptqobject.cpp | |
| parent | 0460d63ed03f0de574a06268df2a267d44784cb0 (diff) | |
| download | qtscript-0ff8577a992b1d5c011b04e47ade84074cbd3034.tar.gz | |
Improve handling of QScriptEngine::ExcludeDeleteLater.
Determine index dynamically instead of using a hard-coded index
in case should further methods be added.
Change-Id: I8a6a3302a0034561e887ad683141a9ac17be45c8
Task-numbers: QTBUG-23502
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Diffstat (limited to 'src/script/bridge/qscriptqobject.cpp')
| -rw-r--r-- | src/script/bridge/qscriptqobject.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/script/bridge/qscriptqobject.cpp b/src/script/bridge/qscriptqobject.cpp index 126c6ec..bde8a44 100644 --- a/src/script/bridge/qscriptqobject.cpp +++ b/src/script/bridge/qscriptqobject.cpp @@ -151,9 +151,7 @@ private: static bool hasMethodAccess(const QMetaMethod &method, int index, const QScriptEngine::QObjectWrapOptions &opt) { - // FIXME: this is fragile and may break if signals/slots are added to/removed from QObject. - // See QTBUG-23502 - const int deleteLaterIndex = 3; + static const int deleteLaterIndex = QObject::staticMetaObject.indexOfMethod("deleteLater()"); return (method.access() != QMetaMethod::Private) && ((index != deleteLaterIndex) || !(opt & QScriptEngine::ExcludeDeleteLater)) && (!(opt & QScriptEngine::ExcludeSlots) || (method.methodType() != QMetaMethod::Slot)); |