diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2010-03-24 13:05:38 (GMT) |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2010-03-24 13:09:32 (GMT) |
| commit | 9540e2b5d67af9a26f431c3e8636bff9946e88c4 (patch) | |
| tree | b040515bf5b541a82f8a3a8cdd809777ac2b71dd /src/script/bridge | |
| parent | 739f15838f73e84cb5e5ae58bb8adc267bc1b79c (diff) | |
| download | Qt-9540e2b5d67af9a26f431c3e8636bff9946e88c4.zip Qt-9540e2b5d67af9a26f431c3e8636bff9946e88c4.tar.gz Qt-9540e2b5d67af9a26f431c3e8636bff9946e88c4.tar.bz2 | |
QtScript: Add QObjectWrapOption for not exposing slots
This makes it possible to have a prototype object in place that
handles all slot calls, rather than having the slots be recreated
in each wrapper object.
Task-number: QTBUG-3637
Reviewed-by: Simon Hausmann
Diffstat (limited to 'src/script/bridge')
| -rw-r--r-- | src/script/bridge/qscriptqobject.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/script/bridge/qscriptqobject.cpp b/src/script/bridge/qscriptqobject.cpp index 765e074..83a811b 100644 --- a/src/script/bridge/qscriptqobject.cpp +++ b/src/script/bridge/qscriptqobject.cpp @@ -151,7 +151,8 @@ private: static bool hasMethodAccess(const QMetaMethod &method, int index, const QScriptEngine::QObjectWrapOptions &opt) { return (method.access() != QMetaMethod::Private) - && ((index != 2) || !(opt & QScriptEngine::ExcludeDeleteLater)); + && ((index != 2) || !(opt & QScriptEngine::ExcludeDeleteLater)) + && (!(opt & QScriptEngine::ExcludeSlots) || (method.methodType() != QMetaMethod::Slot)); } static bool isEnumerableMetaProperty(const QMetaProperty &prop, |